Move CARD_PREVIEW_MODE and CORNER_ROUNDNESS to Setting.Global. (2a83184d) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -16450,6 +16450,26 @@ public final class Settings {
		* @hide
		*/
		public static final String ALTERNATE_LAUNCHER_ENABLED = "alternate_launcher_enabled";

		/**
		* Wear card preview mode.
		* @hide
		*/
		public static final String CARD_PREVIEW_MODE = "card_preview_mode";

		// Possible CARD_PREVIEW_MODE values.
		/** @hide */
		public static final int CARD_PREVIEW_MODE_LOW = 0;
		/** @hide */
		public static final int CARD_PREVIEW_MODE_NORMAL = 1;
		/** @hide */
		public static final int CARD_PREVIEW_MODE_HIGH = 2;

		/**
		* How round the corners of square screens are.
		* @hide
		*/
		public static final String CORNER_ROUNDNESS = "corner_roundness";
		}
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -280,4 +280,7 @@

		<!-- Whether to use an alternate launcher if available. -->
		<bool name="def_wearable_alternateLauncherEnabled">true</bool>

		<!-- If a square screen, how rounded the corners are. Same as CSS border-radius property. -->
		<integer name="def_wearable_squareScreenCornerRoundness">0</integer>
		</resources>

+9 −0

Original line number	Diff line number	Diff line
		@@ -248,6 +248,15 @@ public class GlobalSettingsValidators {
		}));
		VALIDATORS.put(Global.Wearable.MUTE_WHEN_OFF_BODY_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.ALTERNATE_LAUNCHER_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(
		Global.Wearable.CARD_PREVIEW_MODE,
		new DiscreteValueValidator(
		new String[] {
		String.valueOf(Global.Wearable.CARD_PREVIEW_MODE_LOW),
		String.valueOf(Global.Wearable.CARD_PREVIEW_MODE_NORMAL),
		String.valueOf(Global.Wearable.CARD_PREVIEW_MODE_HIGH)
		}));
		VALIDATORS.put(Global.Wearable.CORNER_ROUNDNESS, ANY_INTEGER_VALIDATOR);
		}
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -5261,6 +5261,16 @@ public class SettingsProvider extends ContentProvider {
		getContext()
		.getResources()
		.getBoolean(R.bool.def_wearable_alternateLauncherEnabled));
		initGlobalSettingsDefaultValForWearLocked(
		Global.Wearable.CARD_PREVIEW_MODE,
		Global.Wearable.CARD_PREVIEW_MODE_NORMAL);
		initGlobalSettingsDefaultValForWearLocked(
		Global.Wearable.CORNER_ROUNDNESS,
		getContext()
		.getResources()
		.getInteger(
		R.integer
		.def_wearable_squareScreenCornerRoundness));

		// TODO(b/164398026): add necessary initialization logic for all entries.
		currentVersion = 204;

+3 −1

Original line number	Diff line number	Diff line
		@@ -626,7 +626,9 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.STEM_3_DEFAULT_DATA,
		Settings.Global.Wearable.MUTE_WHEN_OFF_BODY_ENABLED,
		Settings.Global.Wearable.WEAR_OS_VERSION_STRING,
		Settings.Global.Wearable.ALTERNATE_LAUNCHER_ENABLED);
		Settings.Global.Wearable.ALTERNATE_LAUNCHER_ENABLED,
		Settings.Global.Wearable.CARD_PREVIEW_MODE,
		Settings.Global.Wearable.CORNER_ROUNDNESS);

		private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(