Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I90345cd4c7a10830f5fd53db2ceb6233e2f7f381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matt Casey
2023-02-16 14:10:31 +00:00
committed by Automerger Merge Worker
parent 6a277e6194 e8544a3742
commit dae0881b9c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/content/Intent.java
View File

@@ -5741,14 +5741,13 @@ 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.
* @hide * @hide
*/ */
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