Merge "Moved USER_SETUP_PERSONALIZATION_* values to Settings$Secure." (ee89dd9c) · Commits · e / os / android_frameworks_base

api/system-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -4545,10 +4545,6 @@ package android.provider {
		public final class Settings {
		field public static final java.lang.String ACTION_ENTERPRISE_PRIVACY_SETTINGS = "android.settings.ENTERPRISE_PRIVACY_SETTINGS";
		field public static final java.lang.String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS";
		field public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10; // 0xa
		field public static final int USER_SETUP_PERSONALIZATION_NOT_STARTED = 0; // 0x0
		field public static final int USER_SETUP_PERSONALIZATION_PAUSED = 2; // 0x2
		field public static final int USER_SETUP_PERSONALIZATION_STARTED = 1; // 0x1
		}

		public static final class Settings.Global extends android.provider.Settings.NameValueTable {
		@@ -4592,6 +4588,10 @@ package android.provider {
		field public static final java.lang.String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";
		field public static final java.lang.String MANUAL_RINGER_TOGGLE_COUNT = "manual_ringer_toggle_count";
		field public static final java.lang.String USER_SETUP_COMPLETE = "user_setup_complete";
		field public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10; // 0xa
		field public static final int USER_SETUP_PERSONALIZATION_NOT_STARTED = 0; // 0x0
		field public static final int USER_SETUP_PERSONALIZATION_PAUSED = 2; // 0x2
		field public static final int USER_SETUP_PERSONALIZATION_STARTED = 1; // 0x1
		field public static final java.lang.String USER_SETUP_PERSONALIZATION_STATE = "user_setup_personalization_state";
		field public static final java.lang.String VOLUME_HUSH_GESTURE = "volume_hush_gesture";
		}

core/java/android/provider/Settings.java

+46 −47

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


		/**
		* Indicates that the user has not started setup personalization.
		* One of the possible states for {@link Secure#USER_SETUP_PERSONALIZATION_STATE}.
		*
		* @hide
		*/
		@SystemApi
		public static final int USER_SETUP_PERSONALIZATION_NOT_STARTED = 0;

		/**
		* Indicates that the user has not yet completed setup personalization.
		* One of the possible states for {@link Secure#USER_SETUP_PERSONALIZATION_STATE}.
		*
		* @hide
		*/
		@SystemApi
		public static final int USER_SETUP_PERSONALIZATION_STARTED = 1;

		/**
		* Indicates that the user has snoozed personalization and will complete it later.
		* One of the possible states for {@link Secure#USER_SETUP_PERSONALIZATION_STATE}.
		*
		* @hide
		*/
		@SystemApi
		public static final int USER_SETUP_PERSONALIZATION_PAUSED = 2;

		/**
		* Indicates that the user has completed setup personalization.
		* One of the possible states for {@link Secure#USER_SETUP_PERSONALIZATION_STATE}.
		*
		* @hide
		*/
		@SystemApi
		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_PAUSED,
		USER_SETUP_PERSONALIZATION_COMPLETE
		})
		public @interface UserSetupPersonalization {}

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

		/**
		* Indicates that the user has not started setup personalization.
		* One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.
		*
		* @hide
		*/
		@SystemApi
		public static final int USER_SETUP_PERSONALIZATION_NOT_STARTED = 0;

		/**
		* Indicates that the user has not yet completed setup personalization.
		* One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.
		*
		* @hide
		*/
		@SystemApi
		public static final int USER_SETUP_PERSONALIZATION_STARTED = 1;

		/**
		* Indicates that the user has snoozed personalization and will complete it later.
		* One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.
		*
		* @hide
		*/
		@SystemApi
		public static final int USER_SETUP_PERSONALIZATION_PAUSED = 2;

		/**
		* Indicates that the user has completed setup personalization.
		* One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.
		*
		* @hide
		*/
		@SystemApi
		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_PAUSED,
		USER_SETUP_PERSONALIZATION_COMPLETE
		})
		public @interface UserSetupPersonalization {}

		/**
		* Defines the user's current state of device personalization.
		* The possible states are defined in {@link UserSetupPersonalization}.