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

Merge "DO NOT MERGE - Backport master API changes" into tm-qpr-dev

Browse Source
This commit is contained in:
Andrey Epin
2023-01-23 18:44:34 +00:00
committed by Android (Google) Code Review
parent 8c72c3c907 4f0cd1b00f
commit 115022463d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5737,7 +5737,7 @@ public class Intent implements Parcelable, Cloneable {
* @hide
*/
public static final String EXTRA_CHOOSER_CUSTOM_ACTIONS =
"android.intent.extra.EXTRA_CHOOSER_CUSTOM_ACTIONS";
"android.intent.extra.CHOOSER_CUSTOM_ACTIONS";
/**
* Optional argument to be used with {@link #ACTION_CHOOSER}.
@@ -5748,7 +5748,7 @@ public class Intent implements Parcelable, Cloneable {
* @hide
*/
public static final String EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION =
"android.intent.extra.EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION";
"android.intent.extra.CHOOSER_PAYLOAD_RESELECTION_ACTION";
/**
* An {@code ArrayList} of {@code String} annotations describing content for

7
core/java/android/service/chooser/ChooserAction.java
View File

@@ -27,10 +27,9 @@ import java.util.Objects;
/**
* A ChooserAction is an app-defined action that can be provided to the Android Sharesheet to
* be shown to the user when {@link android.content.Intent.ACTION_CHOOSER} is invoked.
* be shown to the user when {@link android.content.Intent#ACTION_CHOOSER} is invoked.
*
* @see android.content.Intent.EXTRA_CHOOSER_CUSTOM_ACTIONS
* @see android.content.Intent.EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION
* @see android.content.Intent#EXTRA_CHOOSER_CUSTOM_ACTIONS
* @hide
*/
public final class ChooserAction implements Parcelable {
@@ -88,6 +87,7 @@ public final class ChooserAction implements Parcelable {
return "ChooserAction {" + "label=" + mLabel + ", intent=" + mAction + "}";
}
@NonNull
public static final Parcelable.Creator<ChooserAction> CREATOR =
new Creator<ChooserAction>() {
@Override
@@ -137,6 +137,7 @@ public final class ChooserAction implements Parcelable {
* object.
* @return the built action
*/
@NonNull
public ChooserAction build() {
return new ChooserAction(mIcon, mLabel, mAction);
}