Merge "Add vector-specific stroke color A11Y settings to PointerIcon." into main (dd3a3269) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -6177,6 +6177,15 @@ public final class Settings {
		@Readable
		public static final String POINTER_FILL_STYLE = "pointer_fill_style";

		/**
		* Pointer stroke style, specified by
		* {@link android.view.PointerIcon.PointerIconVectorStyleStroke} constants.
		*
		* @hide
		*/
		@Readable
		public static final String POINTER_STROKE_STYLE = "pointer_stroke_style";

		/**
		* Whether lock-to-app will be triggered by long-press on recents.
		* @hide
		@@ -6380,6 +6389,7 @@ public final class Settings {
		PRIVATE_SETTINGS.add(SIP_ASK_ME_EACH_TIME);
		PRIVATE_SETTINGS.add(POINTER_SPEED);
		PRIVATE_SETTINGS.add(POINTER_FILL_STYLE);
		PRIVATE_SETTINGS.add(POINTER_STROKE_STYLE);
		PRIVATE_SETTINGS.add(POINTER_SCALE);
		PRIVATE_SETTINGS.add(LOCK_TO_APP_ENABLED);
		PRIVATE_SETTINGS.add(EGG_MODE);

core/java/android/view/PointerIcon.java

+36 −0

Original line number	Diff line number	Diff line
		@@ -193,6 +193,25 @@ public final class PointerIcon implements Parcelable {
		/** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_END =
		POINTER_ICON_VECTOR_STYLE_FILL_BLUE;

		/** @hide */
		@IntDef(prefix = {"POINTER_ICON_VECTOR_STYLE_STROKE_"}, value = {
		POINTER_ICON_VECTOR_STYLE_STROKE_WHITE,
		POINTER_ICON_VECTOR_STYLE_STROKE_BLACK,
		POINTER_ICON_VECTOR_STYLE_STROKE_NONE
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface PointerIconVectorStyleStroke {}

		/** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_STROKE_WHITE = 0;
		/** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_STROKE_BLACK = 1;
		/** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_STROKE_NONE = 2;

		// If adding PointerIconVectorStyleStroke, update END value for {@link SystemSettingsValidators}
		/** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_STROKE_BEGIN =
		POINTER_ICON_VECTOR_STYLE_STROKE_WHITE;
		/** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_STROKE_END =
		POINTER_ICON_VECTOR_STYLE_STROKE_NONE;

		/** @hide */ public static final float DEFAULT_POINTER_SCALE = 1f;
		/** @hide */ public static final float LARGE_POINTER_SCALE = 2.5f;

		@@ -711,6 +730,23 @@ public final class PointerIcon implements Parcelable {
		};
		}

		/**
		* Convert stroke style constant to resource ID.
		*
		* @hide
		*/
		public static int vectorStrokeStyleToResource(@PointerIconVectorStyleStroke int strokeStyle) {
		return switch (strokeStyle) {
		case POINTER_ICON_VECTOR_STYLE_STROKE_BLACK ->
		com.android.internal.R.style.PointerIconVectorStyleStrokeBlack;
		case POINTER_ICON_VECTOR_STYLE_STROKE_WHITE ->
		com.android.internal.R.style.PointerIconVectorStyleStrokeWhite;
		case POINTER_ICON_VECTOR_STYLE_STROKE_NONE ->
		com.android.internal.R.style.PointerIconVectorStyleStrokeNone;
		default -> com.android.internal.R.style.PointerIconVectorStyleStrokeWhite;
		};
		}

		/**
		* Sets whether drop shadow will draw in the native code.
		*

core/proto/android/providers/settings/system.proto

+1 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ message SystemSettingsProto {
		option (android.msg_privacy).dest = DEST_EXPLICIT;

		optional SettingProto pointer_fill_style = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto pointer_stroke_style = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto pointer_scale = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Pointer pointer = 37;

core/res/res/values/attrs.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -10042,6 +10042,8 @@
		<declare-styleable name="PointerIconVectorTheme">
		<attr name="pointerIconVectorFill" format="color" />
		<attr name="pointerIconVectorFillInverse" format="color" />
		<attr name="pointerIconVectorStroke" format="color" />
		<attr name="pointerIconVectorStrokeInverse" format="color" />
		</declare-styleable>

		<declare-styleable name="Storage">

core/res/res/values/styles.xml

+18 −0

Original line number	Diff line number	Diff line
		@@ -1526,6 +1526,24 @@ please see styles_device_defaults.xml.
		<item name="pointerIconVectorFillInverse">#8AB4F8</item>
		</style>

		<!-- @hide -->
		<style name="PointerIconVectorStyleStrokeWhite">
		<item name="pointerIconVectorStroke">@color/white</item>
		<item name="pointerIconVectorStrokeInverse">@color/black</item>
		</style>

		<!-- @hide -->
		<style name="PointerIconVectorStyleStrokeBlack">
		<item name="pointerIconVectorStroke">@color/black</item>
		<item name="pointerIconVectorStrokeInverse">@color/white</item>
		</style>

		<!-- @hide -->
		<style name="PointerIconVectorStyleStrokeNone">
		<item name="pointerIconVectorStroke">@color/transparent</item>
		<item name="pointerIconVectorStrokeInverse">@color/transparent</item>
		</style>

		<!-- @hide -->
		<style name="aerr_list_item" parent="Widget.Material.Light.Button.Borderless">
		<item name="minHeight">?attr/listPreferredItemHeightSmall</item>