Merge "Add the UPGRADE_DATA_MIGRATION_STATUS setting which indicates whether... (4a3cc864) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+34 −0

Original line number	Diff line number	Diff line
		@@ -18603,6 +18603,40 @@ public final class Settings {
		* @hide
		*/
		public static final int ACCESSIBILITY_VIBRATION_WATCH_SPEED_VERY_FAST = 4;

		/**
		* The key to indicate the data migration status on device upgrade in Wear Services.
		* @hide
		*/
		public static final String UPGRADE_DATA_MIGRATION_STATUS =
		"upgrade_data_migration_status";

		/**
		* Constant indicating that the data migration is not needed.
		*
		* The value should be provided with setting name {@link
		* #UPGRADE_DATA_MIGRATION_STATUS}.
		* @hide
		*/
		public static final int UPGRADE_DATA_MIGRATION_NOT_NEEDED = 0;

		/**
		* Constant indicating that the data migration is not yet finished.
		*
		* The value should be provided with setting name {@link
		* #UPGRADE_DATA_MIGRATION_STATUS}.
		* @hide
		*/
		public static final int UPGRADE_DATA_MIGRATION_PENDING = 1;

		/**
		* Constant indicating that the data migration is finished.
		*
		* The value should be provided with setting name {@link
		* #UPGRADE_DATA_MIGRATION_STATUS}.
		* @hide
		*/
		public static final int UPGRADE_DATA_MIGRATION_DONE = 2;
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ public class GlobalSettings {
		Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS,
		Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER,
		Settings.Global.Wearable.DYNAMIC_COLOR_THEME_ENABLED,
		Settings.Global.Wearable.UPGRADE_DATA_MIGRATION_STATUS,
		Settings.Global.HDR_CONVERSION_MODE,
		Settings.Global.HDR_FORCE_CONVERSION_TYPE,
		};

+7 −0

Original line number	Diff line number	Diff line
		@@ -404,5 +404,12 @@ public class GlobalSettingsValidators {
		}));
		VALIDATORS.put(Global.Wearable.DYNAMIC_COLOR_THEME_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.SCREENSHOT_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.UPGRADE_DATA_MIGRATION_STATUS,
		new DiscreteValueValidator(
		new String[] {
		String.valueOf(Global.Wearable.UPGRADE_DATA_MIGRATION_NOT_NEEDED),
		String.valueOf(Global.Wearable.UPGRADE_DATA_MIGRATION_PENDING),
		String.valueOf(Global.Wearable.UPGRADE_DATA_MIGRATION_DONE)
		}));
		}
		}