Merge "Minor Type fixes and formatting" into main (52e461e0) · Commits · e / os / android_frameworks_base

core/java/android/content/theming/FieldColor.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -31,13 +31,9 @@ import java.util.regex.Pattern;
		public class FieldColor extends ThemeSettingsField<Integer, String> {
		private static final Pattern COLOR_PATTERN = Pattern.compile("[0-9a-fA-F]{6,8}");

		public FieldColor(
		String key,
		Function<ThemeSettingsUpdater, Integer> updaterGetter,
		public FieldColor(String key, Function<ThemeSettingsUpdater, Integer> updaterGetter,
		BiConsumer<ThemeSettingsUpdater, Integer> updaterSetter,
		Function<ThemeSettings, Integer> getter,
		ThemeSettings defaults
		) {
		Function<ThemeSettings, Integer> getter, ThemeSettings defaults) {
		super(key, updaterGetter, updaterSetter, getter, defaults);
		}

core/java/android/content/theming/FieldColorBoth.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -27,13 +27,9 @@ import java.util.function.Function;
		/** @hide */
		@FlaggedApi(android.server.Flags.FLAG_ENABLE_THEME_SERVICE)
		public class FieldColorBoth extends ThemeSettingsField<Boolean, String> {
		public FieldColorBoth(
		String key,
		Function<ThemeSettingsUpdater, Boolean> updaterGetter,
		public FieldColorBoth(String key, Function<ThemeSettingsUpdater, Boolean> updaterGetter,
		BiConsumer<ThemeSettingsUpdater, Boolean> updaterSetter,
		Function<ThemeSettings, Boolean> getter,
		ThemeSettings defaults
		) {
		Function<ThemeSettings, Boolean> getter, ThemeSettings defaults) {
		super(key, updaterGetter, updaterSetter, getter, defaults);
		}

core/java/android/content/theming/FieldColorIndex.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -24,13 +24,9 @@ import java.util.function.Function;
		/** @hide */
		@FlaggedApi(android.server.Flags.FLAG_ENABLE_THEME_SERVICE)
		public class FieldColorIndex extends ThemeSettingsField<Integer, String> {
		public FieldColorIndex(
		String key,
		Function<ThemeSettingsUpdater, Integer> updaterGetter,
		public FieldColorIndex(String key, Function<ThemeSettingsUpdater, Integer> updaterGetter,
		BiConsumer<ThemeSettingsUpdater, Integer> updaterSetter,
		Function<ThemeSettings, Integer> getter,
		ThemeSettings defaults
		) {
		Function<ThemeSettings, Integer> getter, ThemeSettings defaults) {
		super(key, updaterGetter, updaterSetter, getter, defaults);
		}

core/java/android/content/theming/FieldColorSource.java

+15 −4

Original line number	Diff line number	Diff line
		@@ -16,19 +16,29 @@

		package android.content.theming;

		import static java.lang.annotation.ElementType.FIELD;
		import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
		import static java.lang.annotation.ElementType.METHOD;
		import static java.lang.annotation.ElementType.PARAMETER;
		import static java.lang.annotation.RetentionPolicy.SOURCE;

		import android.annotation.FlaggedApi;
		import android.annotation.StringDef;

		import androidx.annotation.Nullable;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.lang.annotation.Target;
		import java.util.function.BiConsumer;
		import java.util.function.Function;

		/** @hide */
		@FlaggedApi(android.server.Flags.FLAG_ENABLE_THEME_SERVICE)
		public class FieldColorSource extends ThemeSettingsField<String, String> {
		public static final String VALUE_PRESET = "preset";
		public static final String VALUE_HOME_WALLPAPER = "home_wallpaper";
		public static final String VALUE_LOCK_WALLPAPER = "lock_wallpaper";

		public FieldColorSource(
		String key,
		Function<ThemeSettingsUpdater, String> updaterGetter,
		@@ -54,7 +64,7 @@ public class FieldColorSource extends ThemeSettingsField<String, String> {
		@Override
		public boolean validate(String value) {
		return switch (value) {
		case "preset", "home_wallpaper", "lock_wallpaper" -> true;
		case VALUE_PRESET, VALUE_HOME_WALLPAPER, VALUE_LOCK_WALLPAPER -> true;
		default -> false;
		};
		}
		@@ -70,8 +80,9 @@ public class FieldColorSource extends ThemeSettingsField<String, String> {
		}


		@StringDef({"preset", "home_wallpaper", "lock_wallpaper"})
		@Retention(RetentionPolicy.SOURCE)
		@StringDef({VALUE_PRESET, VALUE_HOME_WALLPAPER, VALUE_LOCK_WALLPAPER})
		@Target({PARAMETER, METHOD, LOCAL_VARIABLE, FIELD})
		@Retention(SOURCE)
		@interface Type {
		}
		}

core/java/android/content/theming/FieldThemeStyle.java

+4 −11

Original line number	Diff line number	Diff line
		@@ -27,22 +27,15 @@ import java.util.function.Function;
		/** @hide */
		@FlaggedApi(android.server.Flags.FLAG_ENABLE_THEME_SERVICE)
		public class FieldThemeStyle extends ThemeSettingsField<Integer, String> {
		public FieldThemeStyle(
		String key,
		Function<ThemeSettingsUpdater, Integer> updaterGetter,
		public FieldThemeStyle(String key, Function<ThemeSettingsUpdater, Integer> updaterGetter,
		BiConsumer<ThemeSettingsUpdater, Integer> updaterSetter,
		Function<ThemeSettings, Integer> getter,
		ThemeSettings defaults
		) {
		Function<ThemeSettings, Integer> getter, ThemeSettings defaults) {
		super(key, updaterGetter, updaterSetter, getter, defaults);
		}

		private static final @ThemeStyle.Type List<Integer> sValidStyles = Arrays.asList(
		ThemeStyle.EXPRESSIVE,
		ThemeStyle.SPRITZ,
		ThemeStyle.TONAL_SPOT, ThemeStyle.FRUIT_SALAD, ThemeStyle.RAINBOW,
		ThemeStyle.VIBRANT,
		ThemeStyle.MONOCHROMATIC);
		ThemeStyle.EXPRESSIVE, ThemeStyle.SPRITZ, ThemeStyle.TONAL_SPOT, ThemeStyle.FRUIT_SALAD,
		ThemeStyle.RAINBOW, ThemeStyle.VIBRANT, ThemeStyle.MONOCHROMATIC);

		@Override
		public String serialize(@ThemeStyle.Type Integer typedValue) {