Merge "Simplify dock setup state setting" into tm-qpr-dev am: baf76a1173
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164726 Change-Id: I7867874177d4dfff8c1133c22b1f8562ed913450 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -9165,14 +9165,6 @@ public final class Settings {
|
|||||||
*/
|
*/
|
||||||
public static final int DOCK_SETUP_PAUSED = 2;
|
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.
|
* 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}.
|
||||||
@@ -9187,7 +9179,6 @@ 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_RESUMED,
|
|
||||||
DOCK_SETUP_COMPLETED
|
DOCK_SETUP_COMPLETED
|
||||||
})
|
})
|
||||||
public @interface DockSetupState {
|
public @interface DockSetupState {
|
||||||
|
|||||||
Reference in New Issue
Block a user