Merge "Simplify dock setup state setting" into tm-qpr-dev am: baf76a1173 am: 332b0feb76

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

Change-Id: I013da3d032d55e3cd63ef38d199b19edbb75b001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-05 18:49:36 +00:00
committed by Automerger Merge Worker

View File

@@ -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 {