Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I2b9fa4003e50289e2a4dd3f67d06ee18711bda0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Leshner
2022-12-07 22:24:41 +00:00
committed by Automerger Merge Worker
parent d47dbbb9b1 8573c6a4fd
commit 0ee0cda5df
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/Settings.java
View File

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