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

Commit 4c6debb7 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Launch document sharing into unique activities" into lmp-preview-dev

parents f5188cf6 2c60de3f

core/java/android/widget/ShareActionProvider.java

+2 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ public class ShareActionProvider extends ActionProvider { 
            final String action = shareIntent.getAction();

            if (Intent.ACTION_SEND.equals(action) || Intent.ACTION_SEND_MULTIPLE.equals(action)) {

                shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                        Intent.FLAG_ACTIVITY_MULTIPLE_TASK |

                        Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);

            }

        }
@@ -303,6 +304,7 @@ public class ShareActionProvider extends ActionProvider { 
                if (Intent.ACTION_SEND.equals(action) ||

                        Intent.ACTION_SEND_MULTIPLE.equals(action)) {

                    launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                            Intent.FLAG_ACTIVITY_MULTIPLE_TASK |

                            Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);

                }

                mContext.startActivity(launchIntent);

core/java/com/android/internal/app/ChooserActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ public class ChooserActivity extends ResolverActivity { 
            if (Intent.ACTION_SEND.equals(action) ||

                    Intent.ACTION_SEND_MULTIPLE.equals(action)) {

                target.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                        Intent.FLAG_ACTIVITY_MULTIPLE_TASK |

                        Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);

            }

        }
@@ -61,6 +62,7 @@ public class ChooserActivity extends ResolverActivity { 
                if (Intent.ACTION_SEND.equals(action) ||

                        Intent.ACTION_SEND_MULTIPLE.equals(action)) {

                    in.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                            Intent.FLAG_ACTIVITY_MULTIPLE_TASK |

                            Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);

                }

                initialIntents[i] = in;