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

Commit 6734e1fb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Simplify dock setup state setting" into tm-qpr-dev am: baf76a11 am: 332b0feb 

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



Change-Id: I013da3d032d55e3cd63ef38d199b19edbb75b001
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5efb9c24 332b0feb

core/java/android/provider/Settings.java

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

        public static final int DOCK_SETUP_PAUSED = 2;













        /**













         * Indicates that the dock setup has resumed snoozing but the user hasn't started it yet.













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













         *













         * @hide













         */













        public static final int DOCK_SETUP_RESUMED = 3;



























        /**















         * Indicates that the user has completed dock setup.















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









@@ -9222,7 +9214,6 @@ public final class Settings {













                DOCK_SETUP_NOT_STARTED,















                DOCK_SETUP_STARTED,















                DOCK_SETUP_PAUSED,













                DOCK_SETUP_RESUMED,















                DOCK_SETUP_COMPLETED















        })















        public @interface DockSetupState {