Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f4420c4 authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Add new dock setup states to state enum" into tm-qpr-dev am: 3bfcd979 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20947523



Change-Id: I17654f91c30c3e44b4d26b77a5f080dd604272fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8dacbdc3 3bfcd979

core/java/android/provider/Settings.java

+19 −1
Original line number Diff line number Diff line
@@ -9232,6 +9232,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}.









@@ -9240,6 +9248,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({









@@ -9247,7 +9263,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 {















        }