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

Commit dae0881b authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION ->... 

Merge "EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION -> EXTRA_CHOOSER_MODIFY_SHARE_ACTION" into tm-qpr-dev am: e8544a37

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21444626



Change-Id: I90345cd4c7a10830f5fd53db2ceb6233e2f7f381
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a277e61 e8544a37

core/java/android/content/Intent.java

+5 −6
Original line number Diff line number Diff line
@@ -5741,14 +5741,13 @@ public class Intent implements Parcelable, Cloneable { 


    /**

     * Optional argument to be used with {@link #ACTION_CHOOSER}.

     * A {@link android.app.PendingIntent} to be sent when the user wants to do payload reselection

     * in the sharesheet.

     * A reselection action allows the user to return to the source app to change the content being

     * shared.

     * A {@link android.app.PendingIntent} to be sent when the user wants to modify the content that

     * they're sharing. This can be used to allow the user to return to the source app to, for

     * example, select different media.

     * @hide

     */

    public static final String EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION =

            "android.intent.extra.CHOOSER_PAYLOAD_RESELECTION_ACTION";

    public static final String EXTRA_CHOOSER_MODIFY_SHARE_ACTION =

            "android.intent.extra.CHOOSER_MODIFY_SHARE_ACTION";



    /**

     * An {@code ArrayList} of {@code String} annotations describing content for