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

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

Merge "Add API for sharesheet text album hint" into main

parents 7d8cc2b0 e6753e24
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -11254,6 +11254,7 @@ package android.content {
    field public static final String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST";
    field public static final String CATEGORY_VOICE = "android.intent.category.VOICE";
    field public static final String CATEGORY_VR_HOME = "android.intent.category.VR_HOME";
    field @FlaggedApi("android.service.chooser.chooser_album_text") public static final int CHOOSER_CONTENT_TYPE_ALBUM = 1; // 0x1
    field @NonNull public static final android.os.Parcelable.Creator<android.content.Intent> CREATOR;
    field public static final String EXTRA_ALARM_COUNT = "android.intent.extra.ALARM_COUNT";
    field public static final String EXTRA_ALLOW_MULTIPLE = "android.intent.extra.ALLOW_MULTIPLE";
@@ -11275,6 +11276,7 @@ package android.content {
    field public static final String EXTRA_CHANGED_COMPONENT_NAME_LIST = "android.intent.extra.changed_component_name_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 @FlaggedApi("android.service.chooser.chooser_album_text") public static final String EXTRA_CHOOSER_CONTENT_TYPE_HINT = "android.intent.extra.CHOOSER_CONTENT_TYPE_HINT";
    field public static final String EXTRA_CHOOSER_CUSTOM_ACTIONS = "android.intent.extra.CHOOSER_CUSTOM_ACTIONS";
    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";
+30 −0
Original line number Diff line number Diff line
@@ -6033,6 +6033,36 @@ public class Intent implements Parcelable, Cloneable {
    public static final String EXTRA_CHOOSER_MODIFY_SHARE_ACTION =
            "android.intent.extra.CHOOSER_MODIFY_SHARE_ACTION";
    /**
     * Optional integer extra to be used with {@link #ACTION_CHOOSER} to describe conteng being
     * shared.
     * <p>
     * If provided, sharesheets may customize their UI presentation to include a more precise
     * description of the content being shared.
     *
     * @see #CHOOSER_CONTENT_TYPE_ALBUM
     * @see #createChooser(Intent, CharSequence)
     */
    @FlaggedApi(android.service.chooser.Flags.FLAG_CHOOSER_ALBUM_TEXT)
    public static final String EXTRA_CHOOSER_CONTENT_TYPE_HINT =
            "android.intent.extra.CHOOSER_CONTENT_TYPE_HINT";
    /** @hide */
    @IntDef(prefix = {"CHOOSER_CONTENT_TYPE_"}, value = {
            CHOOSER_CONTENT_TYPE_ALBUM,
    })
    @Retention(RetentionPolicy.SOURCE)
    public @interface ChooserContentType {}
    /**
     * Indicates that the content being shared with {@link #ACTION_SEND} represents an album
     * (e.g. containing photos).
     *
     * @see #EXTRA_CHOOSER_CONTENT_TYPE_HINT
     */
    @FlaggedApi(android.service.chooser.Flags.FLAG_CHOOSER_ALBUM_TEXT)
    public static final int CHOOSER_CONTENT_TYPE_ALBUM = 1;
    /**
     * An {@code ArrayList} of {@code String} annotations describing content for
     * {@link #ACTION_CHOOSER}.
+7 −0
Original line number Diff line number Diff line
package: "android.service.chooser"

flag {
  name: "chooser_album_text"
  namespace: "intentresolver"
  description: "Flag controlling the album text subtype hint for sharesheet"
  bug: "323380224"
}

flag {
  name: "support_nfc_resolver"
  namespace: "systemui"