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

Commit aa2427c1 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:... 

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

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



Change-Id: I65dacbaeaaacfe008fdccf58ba23a60a01807dcc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c0ceb7c 0ee0cda5

core/java/android/provider/Settings.java

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

        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.















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









@@ -9383,6 +9391,7 @@ public final class Settings {













                DOCK_SETUP_NOT_STARTED,















                DOCK_SETUP_STARTED,















                DOCK_SETUP_PAUSED,













                DOCK_SETUP_PROMPTED,















                DOCK_SETUP_COMPLETED















        })















        public @interface DockSetupState {