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

Commit e4b0ce5c authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge "EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION -> EXTRA_CHOOSER_MODIFY_SHARE_ACTION"

parents f5cf36a2 651a576c

core/api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -10879,7 +10879,7 @@ package android.content { 
    field public static final String EXTRA_CHANGED_PACKAGE_LIST = "android.intent.extra.changed_package_list";

    field public static final String EXTRA_CHANGED_PACKAGE_LIST = "android.intent.extra.changed_package_list";

    field public static final String EXTRA_CHANGED_UID_LIST = "android.intent.extra.changed_uid_list";

    field public static final String EXTRA_CHANGED_UID_LIST = "android.intent.extra.changed_uid_list";

    field public static final String EXTRA_CHOOSER_CUSTOM_ACTIONS = "android.intent.extra.CHOOSER_CUSTOM_ACTIONS";

    field public static final String EXTRA_CHOOSER_CUSTOM_ACTIONS = "android.intent.extra.CHOOSER_CUSTOM_ACTIONS";

    field public static final String EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION = "android.intent.extra.CHOOSER_PAYLOAD_RESELECTION_ACTION";

    field public static final String EXTRA_CHOOSER_MODIFY_SHARE_ACTION = "android.intent.extra.CHOOSER_MODIFY_SHARE_ACTION";

    field public static final String EXTRA_CHOOSER_REFINEMENT_INTENT_SENDER = "android.intent.extra.CHOOSER_REFINEMENT_INTENT_SENDER";

    field public static final String EXTRA_CHOOSER_REFINEMENT_INTENT_SENDER = "android.intent.extra.CHOOSER_REFINEMENT_INTENT_SENDER";

    field public static final String EXTRA_CHOOSER_TARGETS = "android.intent.extra.CHOOSER_TARGETS";

    field public static final String EXTRA_CHOOSER_TARGETS = "android.intent.extra.CHOOSER_TARGETS";

    field public static final String EXTRA_CHOSEN_COMPONENT = "android.intent.extra.CHOSEN_COMPONENT";

    field public static final String EXTRA_CHOSEN_COMPONENT = "android.intent.extra.CHOSEN_COMPONENT";

core/java/android/content/Intent.java

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




    /**

    /**

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

     * 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

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

     * in the sharesheet.

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

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

     * example, select different media.

     * shared.

     */

     */

    public static final String EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION =

    public static final String EXTRA_CHOOSER_MODIFY_SHARE_ACTION =

            "android.intent.extra.CHOOSER_PAYLOAD_RESELECTION_ACTION";

            "android.intent.extra.CHOOSER_MODIFY_SHARE_ACTION";





    /**

    /**

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

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