Merge "Merge "Add new dock setup states to state enum" into tm-qpr-dev am:... (39ea9299) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+19 −1

Original line number	Diff line number	Diff line
		@@ -9407,6 +9407,14 @@ public final class Settings {
		*/
		public static final int DOCK_SETUP_PROMPTED = 3;

		/**
		* Indicates that the user has started dock setup but never finished it.
		* One of the possible states for {@link #DOCK_SETUP_STATE}.
		*
		* @hide
		*/
		public static final int DOCK_SETUP_INCOMPLETE = 4;

		/**
		* Indicates that the user has completed dock setup.
		* One of the possible states for {@link #DOCK_SETUP_STATE}.
		@@ -9415,6 +9423,14 @@ public final class Settings {
		*/
		public static final int DOCK_SETUP_COMPLETED = 10;

		/**
		* Indicates that dock setup timed out before the user could complete it.
		* One of the possible states for {@link #DOCK_SETUP_STATE}.
		*
		* @hide
		*/
		public static final int DOCK_SETUP_TIMED_OUT = 11;

		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef({
		@@ -9422,7 +9438,9 @@ public final class Settings {
		DOCK_SETUP_STARTED,
		DOCK_SETUP_PAUSED,
		DOCK_SETUP_PROMPTED,
		DOCK_SETUP_COMPLETED
		DOCK_SETUP_INCOMPLETE,
		DOCK_SETUP_COMPLETED,
		DOCK_SETUP_TIMED_OUT
		})
		public @interface DockSetupState {
		}