diff options
| author | Adam Powell <adamp@google.com> | 2012-01-24 13:58:41 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-24 13:58:41 -0800 |
| commit | 37e800d6883436a477f013f2f329d1ed296ef3bb (patch) | |
| tree | 127efb31c862992a39b92c6e5dac6065673c5499 /core/java/android/widget/ActivityChooserView.java | |
| parent | 15a7bc62e1ca0727781853adbaee1ae52e464b57 (diff) | |
| parent | 314419ccb9daa215c5148f59e5b60c696ef51385 (diff) | |
Merge "Update ShareActionProvider to clear the sharing activity when the task is reset."
Diffstat (limited to 'core/java/android/widget/ActivityChooserView.java')
| -rw-r--r-- | core/java/android/widget/ActivityChooserView.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/ActivityChooserView.java b/core/java/android/widget/ActivityChooserView.java index 055ccb64da0e..be6b4e2f5c76 100644 --- a/core/java/android/widget/ActivityChooserView.java +++ b/core/java/android/widget/ActivityChooserView.java @@ -545,6 +545,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod position = mAdapter.getShowDefaultActivity() ? position : position + 1; Intent launchIntent = mAdapter.getDataModel().chooseActivity(position); if (launchIntent != null) { + launchIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); mContext.startActivity(launchIntent); } } @@ -562,6 +563,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod final int index = mAdapter.getDataModel().getActivityIndex(defaultActivity); Intent launchIntent = mAdapter.getDataModel().chooseActivity(index); if (launchIntent != null) { + launchIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); mContext.startActivity(launchIntent); } } else if (view == mExpandActivityOverflowButton) { |