Merge "Merge "Add setupwizard personalisation state to Settings" into pi-dev... (84022530) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+37 −0

Original line number	Diff line number	Diff line
		@@ -1715,6 +1715,34 @@ public final class Settings {
		})
		public @interface ResetMode{}


		/**
		* User has not started setup personalization.
		* @hide
		*/
		public static final int USER_SETUP_PERSONALIZATION_NOT_STARTED = 0;

		/**
		* User has not yet completed setup personalization.
		* @hide
		*/
		public static final int USER_SETUP_PERSONALIZATION_STARTED = 1;

		/**
		* User has completed setup personalization.
		* @hide
		*/
		public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10;

		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef({
		USER_SETUP_PERSONALIZATION_NOT_STARTED,
		USER_SETUP_PERSONALIZATION_STARTED,
		USER_SETUP_PERSONALIZATION_COMPLETE
		})
		public @interface UserSetupPersonalization {}

		/**
		* Activity Extra: Number of certificates
		* <p>
		@@ -5440,6 +5468,15 @@ public final class Settings {
		@TestApi
		public static final String USER_SETUP_COMPLETE = "user_setup_complete";

		/**
		* The current state of device personalization.
		*
		* @hide
		* @see UserSetupPersonalization
		*/
		public static final String USER_SETUP_PERSONALIZATION_STATE =
		"user_setup_personalization_state";

		/**
		* Whether the current user has been set up via setup wizard (0 = false, 1 = true)
		* This value differs from USER_SETUP_COMPLETE in that it can be reset back to 0

+1 −0

Original line number	Diff line number	Diff line
		@@ -572,6 +572,7 @@ public class SettingsBackupTest {
		Settings.Secure.UNSAFE_VOLUME_MUSIC_ACTIVE_MS,
		Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
		Settings.Secure.USER_SETUP_COMPLETE,
		Settings.Secure.USER_SETUP_PERSONALIZATION_STATE,
		Settings.Secure.VOICE_INTERACTION_SERVICE,
		Settings.Secure.VOICE_RECOGNITION_SERVICE,
		Settings.Secure.INSTANT_APPS_ENABLED,