Merge "Set CLEAR_WHEN_TASK_RESET flag when launching Calendar" into froyo

This commit is contained in:
Makoto Onuki 2010-04-12 13:27:15 -07:00 committed by Android (Google) Code Review
commit 1fe0aa19bf

View File

@ -594,6 +594,7 @@ public class MessageView extends Activity implements OnClickListener {
if (!TextUtils.isEmpty(senderPersonal)) { if (!TextUtils.isEmpty(senderPersonal)) {
intent.putExtra(ContactsContract.Intents.Insert.NAME, senderPersonal); intent.putExtra(ContactsContract.Intents.Insert.NAME, senderPersonal);
} }
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
startActivity(intent); startActivity(intent);
} }
@ -811,6 +812,7 @@ public class MessageView extends Activity implements OnClickListener {
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(uri); intent.setData(uri);
intent.putExtra("VIEW", "DAY"); intent.putExtra("VIEW", "DAY");
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
startActivity(intent); startActivity(intent);
} else { } else {
Email.log("meetingInfo without DTSTART " + mMessage.mMeetingInfo); Email.log("meetingInfo without DTSTART " + mMessage.mMeetingInfo);