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

Commit 5f69fb37 authored by Pat Manning's avatar Pat Manning
Browse files

Add new pointer fill color. 

Rename yellow to red, as color token was updated in previous Change-Id: Iabeec21a0ba134f7fbb46b9c1be7683d3fcf9397

Fix: 362455374
Test: SystemSettingsValidators
Flag: android.view.flags.enable_vector_cursor_a11y_settings
Change-Id: I6fbe9865d0561b034bf9dbb6ac64d1d0ddd5afd9
parent ba505abd

core/java/android/view/PointerIcon.java

+10 −6
Original line number Diff line number Diff line
@@ -174,24 +174,26 @@ public final class PointerIcon implements Parcelable { 
    @IntDef(prefix = {"POINTER_ICON_VECTOR_STYLE_FILL_"}, value = {

            POINTER_ICON_VECTOR_STYLE_FILL_BLACK,

            POINTER_ICON_VECTOR_STYLE_FILL_GREEN,

            POINTER_ICON_VECTOR_STYLE_FILL_YELLOW,

            POINTER_ICON_VECTOR_STYLE_FILL_RED,

            POINTER_ICON_VECTOR_STYLE_FILL_PINK,

            POINTER_ICON_VECTOR_STYLE_FILL_BLUE

            POINTER_ICON_VECTOR_STYLE_FILL_BLUE,

            POINTER_ICON_VECTOR_STYLE_FILL_PURPLE

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface PointerIconVectorStyleFill {}



    /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_BLACK = 0;

    /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_GREEN = 1;

    /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_YELLOW = 2;

    /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_RED = 2;

    /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_PINK = 3;

    /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_BLUE = 4;

    /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_PURPLE = 5;



    // If adding a PointerIconVectorStyleFill, update END value for {@link SystemSettingsValidators}

    /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_BEGIN =

            POINTER_ICON_VECTOR_STYLE_FILL_BLACK;

    /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_END =

            POINTER_ICON_VECTOR_STYLE_FILL_BLUE;

            POINTER_ICON_VECTOR_STYLE_FILL_PURPLE;



    /** @hide */

    @IntDef(prefix = {"POINTER_ICON_VECTOR_STYLE_STROKE_"}, value = {
@@ -712,12 +714,14 @@ public final class PointerIcon implements Parcelable { 
                    com.android.internal.R.style.PointerIconVectorStyleFillBlack;

            case POINTER_ICON_VECTOR_STYLE_FILL_GREEN ->

                    com.android.internal.R.style.PointerIconVectorStyleFillGreen;

            case POINTER_ICON_VECTOR_STYLE_FILL_YELLOW ->

                    com.android.internal.R.style.PointerIconVectorStyleFillYellow;

            case POINTER_ICON_VECTOR_STYLE_FILL_RED ->

                    com.android.internal.R.style.PointerIconVectorStyleFillRed;

            case POINTER_ICON_VECTOR_STYLE_FILL_PINK ->

                    com.android.internal.R.style.PointerIconVectorStyleFillPink;

            case POINTER_ICON_VECTOR_STYLE_FILL_BLUE ->

                    com.android.internal.R.style.PointerIconVectorStyleFillBlue;

            case POINTER_ICON_VECTOR_STYLE_FILL_PURPLE ->

                    com.android.internal.R.style.PointerIconVectorStyleFillPurple;

            default -> com.android.internal.R.style.PointerIconVectorStyleFillBlack;

        };

    }

core/res/res/values/styles.xml

+7 −1
Original line number Diff line number Diff line
@@ -1509,7 +1509,7 @@ please see styles_device_defaults.xml. 
    </style>



    <!-- @hide -->

    <style name="PointerIconVectorStyleFillYellow">

    <style name="PointerIconVectorStyleFillRed">

        <item name="pointerIconVectorFill">#F55E57</item>

        <item name="pointerIconVectorFillInverse">#F55E57</item>

    </style>
@@ -1526,6 +1526,12 @@ please see styles_device_defaults.xml. 
        <item name="pointerIconVectorFillInverse">#009DC9</item>

    </style>



    <!-- @hide -->

    <style name="PointerIconVectorStyleFillPurple">

        <item name="pointerIconVectorFill">#AD72FF</item>

        <item name="pointerIconVectorFillInverse">#AD72FF</item>

    </style>



    <!-- @hide -->

    <style name="PointerIconVectorStyleStrokeWhite">

        <item name="pointerIconVectorStroke">@color/white</item>

core/res/res/values/symbols.xml

+2 −1
Original line number Diff line number Diff line
@@ -1705,9 +1705,10 @@ 
  <java-symbol type="style" name="VectorPointer" />

  <java-symbol type="style" name="PointerIconVectorStyleFillBlack" />

  <java-symbol type="style" name="PointerIconVectorStyleFillGreen" />

  <java-symbol type="style" name="PointerIconVectorStyleFillYellow" />

  <java-symbol type="style" name="PointerIconVectorStyleFillRed" />

  <java-symbol type="style" name="PointerIconVectorStyleFillPink" />

  <java-symbol type="style" name="PointerIconVectorStyleFillBlue" />

  <java-symbol type="style" name="PointerIconVectorStyleFillPurple" />

  <java-symbol type="attr" name="pointerIconVectorFill" />

  <java-symbol type="style" name="PointerIconVectorStyleStrokeWhite" />

  <java-symbol type="style" name="PointerIconVectorStyleStrokeBlack" />