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

Commit a9a7d38b authored by Garfield Tan's avatar Garfield Tan Committed by Android (Google) Code Review
Browse files

Merge "Add an Intent action and a relevant extra for Eye Dropper" into main

parents 258da3c7 8b9cea89

AconfigFlags.bp

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ aconfig_declarations_group { 
        "backstage_power_flags_lib",

        "backup_flags_lib",

        "camera_platform_flags_core_java_lib",

        "com.android.eyedropper.flags-aconfig-java",

        "com.android.hardware.input-aconfig-java",

        "com.android.input.flags-aconfig-java",

        "com.android.internal.compat.flags-aconfig-java",

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -11816,6 +11816,7 @@ package android.content { 
    field @Deprecated public static final String ACTION_NEW_OUTGOING_CALL = "android.intent.action.NEW_OUTGOING_CALL";

    field public static final String ACTION_OPEN_DOCUMENT = "android.intent.action.OPEN_DOCUMENT";

    field public static final String ACTION_OPEN_DOCUMENT_TREE = "android.intent.action.OPEN_DOCUMENT_TREE";

    field @FlaggedApi("com.android.eyedropper.enable_eye_dropper_api") public static final String ACTION_OPEN_EYE_DROPPER = "android.intent.action.OPEN_EYE_DROPPER";

    field public static final String ACTION_PACKAGES_SUSPENDED = "android.intent.action.PACKAGES_SUSPENDED";

    field public static final String ACTION_PACKAGES_UNSUSPENDED = "android.intent.action.PACKAGES_UNSUSPENDED";

    field public static final String ACTION_PACKAGE_ADDED = "android.intent.action.PACKAGE_ADDED";
@@ -11963,6 +11964,7 @@ package android.content { 
    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_INTENT_SENDER = "android.intent.extra.CHOSEN_COMPONENT_INTENT_SENDER";

    field @FlaggedApi("com.android.eyedropper.enable_eye_dropper_api") public static final String EXTRA_COLOR = "android.intent.extra.COLOR";

    field public static final String EXTRA_COMPONENT_NAME = "android.intent.extra.COMPONENT_NAME";

    field public static final String EXTRA_CONTENT_ANNOTATIONS = "android.intent.extra.CONTENT_ANNOTATIONS";

    field public static final String EXTRA_CONTENT_QUERY = "android.intent.extra.CONTENT_QUERY";

core/java/android/content/Intent.java

+19 −0
Original line number Diff line number Diff line
@@ -4699,6 +4699,18 @@ public class Intent implements Parcelable, Cloneable { 
    public static final String

            ACTION_DYNAMIC_SENSOR_CHANGED = "android.intent.action.DYNAMIC_SENSOR_CHANGED";













    /**













     * Activity Action: Launch an eye dropper. It allows the user to pick a pixel on the display.













     * The color of the selected pixel is returned to the requesting activity as an activity result.













     * Pixels from secure windows and protected buffers are blacked out.













     * <p>













     * Output: {@link #EXTRA_COLOR getIntExtra(EXTRA_COLOR)} is the color of the selected pixel in













     * ARGB format (0xFFRRGGBB).













     */













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    @FlaggedApi(com.android.eyedropper.Flags.FLAG_ENABLE_EYE_DROPPER_API)













    public static final String ACTION_OPEN_EYE_DROPPER = "android.intent.action.OPEN_EYE_DROPPER";



























    /**















     * Deprecated - use ACTION_FACTORY_RESET instead.















     * @hide










@@ -7139,6 +7151,13 @@ public class Intent implements Parcelable, Cloneable {













    public static final String EXTRA_IS_RESTORE =















            "android.intent.extra.IS_RESTORE";



























    /**













     * Used as an int extra in {@link #ACTION_OPEN_EYE_DROPPER} results to hold the color picked in













     * ARGB format (0xFFRRGGBB).













     */













    @FlaggedApi(com.android.eyedropper.Flags.FLAG_ENABLE_EYE_DROPPER_API)













    public static final String EXTRA_COLOR = "android.intent.extra.COLOR";



























    // ---------------------------------------------------------------------















    // ---------------------------------------------------------------------















    // Intent flags (see mFlags variable).