am 1fe0aa19: Merge "Set CLEAR_WHEN_TASK_RESET flag when launching Calendar" into froyo

Merge commit '1fe0aa19bf9a64dff0fb0965d29f930303208f73' into froyo-plus-aosp

* commit '1fe0aa19bf9a64dff0fb0965d29f930303208f73':
  Set CLEAR_WHEN_TASK_RESET flag when launching Calendar
This commit is contained in:
Makoto Onuki 2010-04-12 13:30:06 -07:00 committed by Android Git Automerger
commit b0690302bf

View File

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