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

Commit a0c808bb authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

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

* commit 'd842513c3df5fd3e46a70ab6798b4d3d20c4ef0b':
  Launch document sharing into unique activities
parents 3407c254 4c6debb7

core/java/android/widget/ShareActionProvider.java

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

            final String action = shareIntent.getAction();

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

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

                shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                        Intent.FLAG_ACTIVITY_MULTIPLE_TASK |

                        Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);

                        Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);

            }

            }

        }

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

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

                        Intent.ACTION_SEND_MULTIPLE.equals(action)) {

                        Intent.ACTION_SEND_MULTIPLE.equals(action)) {

                    launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                    launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                            Intent.FLAG_ACTIVITY_MULTIPLE_TASK |

                            Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);

                            Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);

                }

                }

                mContext.startActivity(launchIntent);

                mContext.startActivity(launchIntent);

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

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

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

                    Intent.ACTION_SEND_MULTIPLE.equals(action)) {

                    Intent.ACTION_SEND_MULTIPLE.equals(action)) {

                target.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                target.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                        Intent.FLAG_ACTIVITY_MULTIPLE_TASK |

                        Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);

                        Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);

            }

            }

        }

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

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

                        Intent.ACTION_SEND_MULTIPLE.equals(action)) {

                        Intent.ACTION_SEND_MULTIPLE.equals(action)) {

                    in.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                    in.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                            Intent.FLAG_ACTIVITY_MULTIPLE_TASK |

                            Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);

                            Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);

                }

                }

                initialIntents[i] = in;

                initialIntents[i] = in;