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

Commit 0ee0cda5 authored by William Leshner's avatar William Leshner Committed by Automerger Merge Worker
Browse files

Merge "Add DOCK_SETUP_PROMPTED enum value to Settings." into tm-qpr-dev am: 8573c6a4 

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



Change-Id: I2b9fa4003e50289e2a4dd3f67d06ee18711bda0b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d47dbbb9 8573c6a4

core/java/android/provider/Settings.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -9224,6 +9224,14 @@ public final class Settings { 
         */

         */

        public static final int DOCK_SETUP_PAUSED = 2;

        public static final int DOCK_SETUP_PAUSED = 2;




















        /**














         * Indicates that the user has been prompted to start dock setup.














         * One of the possible states for {@link #DOCK_SETUP_STATE}.














         *














         * @hide














         */














        public static final int DOCK_SETUP_PROMPTED = 3;
























        /**







        /**











         * Indicates that the user has completed dock setup.







         * Indicates that the user has completed dock setup.











         * One of the possible states for {@link #DOCK_SETUP_STATE}.







         * One of the possible states for {@link #DOCK_SETUP_STATE}.









@@ -9238,6 +9246,7 @@ public final class Settings {









                DOCK_SETUP_NOT_STARTED,







                DOCK_SETUP_NOT_STARTED,











                DOCK_SETUP_STARTED,







                DOCK_SETUP_STARTED,











                DOCK_SETUP_PAUSED,







                DOCK_SETUP_PAUSED,














                DOCK_SETUP_PROMPTED,











                DOCK_SETUP_COMPLETED







                DOCK_SETUP_COMPLETED











        })







        })











        public @interface DockSetupState {







        public @interface DockSetupState {