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

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

Merge "Update EXTRA_CHOOSER_MODIFY_SHARE_ACTION to use ChooserAction" into... 

Merge "Update EXTRA_CHOOSER_MODIFY_SHARE_ACTION to use ChooserAction" into udc-dev am: 04f82f08 am: c7435d9f

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



Change-Id: I19c36a615c7b1394016d63dd42c509d1bd2500e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 635ed67a c7435d9f

core/java/android/content/Intent.java

+2 −3
Original line number Diff line number Diff line
@@ -5920,9 +5920,8 @@ 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 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.













     * A {@link ChooserAction} to allow the user to modify what is being shared in some way. This













     * may be integrated into the content preview on sharesheets that have a preview UI.















     */















    public static final String EXTRA_CHOOSER_MODIFY_SHARE_ACTION =















            "android.intent.extra.CHOOSER_MODIFY_SHARE_ACTION";