Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37e800d6 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

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

parents 15a7bc62 314419cc

core/java/android/widget/ActivityChooserView.java

+2 −0
Original line number Diff line number Diff line
@@ -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) {

core/java/android/widget/ShareActionProvider.java

+1 −0
Original line number Diff line number Diff line
@@ -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;