Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update ShareActionProvider to clear the sharing activity when the task is reset."

Browse Source
This commit is contained in:
Adam Powell
2012-01-24 13:58:41 -08:00
committed by Android (Google) Code Review
parent 15a7bc62e1 314419ccb9
commit 37e800d688
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/ActivityChooserView.java
View File

@@ -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) {

1
core/java/android/widget/ShareActionProvider.java
View File

@@ -279,6 +279,7 @@ public class ShareActionProvider extends ActionProvider {
final int itemId = item.getItemId();
Intent launchIntent = dataModel.chooseActivity(itemId);
if (launchIntent != null) {
launchIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
mContext.startActivity(launchIntent);
}
return true;