diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-15 01:55:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-15 01:55:24 +0000 |
| commit | ee89dd9c6eb56c32eb930811e89b28635c8e0cdf (patch) | |
| tree | 637fd3591e9d6864db68fa70902eb269ae8294f6 /core/java/android | |
| parent | 465a82575af5eaf7aebb798b6719eede7dc2893c (diff) | |
| parent | d1f58b1d59671216f940f8ca163bbde1f9c17081 (diff) | |
Merge "Moved USER_SETUP_PERSONALIZATION_* values to Settings$Secure."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 93 |
1 files changed, 46 insertions, 47 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 040222217db4..e3401e76623e 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1825,53 +1825,6 @@ public final class Settings { }) public @interface ResetMode{} - - /** - * Indicates that the user has not started setup personalization. - * One of the possible states for {@link Secure#USER_SETUP_PERSONALIZATION_STATE}. - * - * @hide - */ - @SystemApi - public static final int USER_SETUP_PERSONALIZATION_NOT_STARTED = 0; - - /** - * Indicates that the user has not yet completed setup personalization. - * One of the possible states for {@link Secure#USER_SETUP_PERSONALIZATION_STATE}. - * - * @hide - */ - @SystemApi - public static final int USER_SETUP_PERSONALIZATION_STARTED = 1; - - /** - * Indicates that the user has snoozed personalization and will complete it later. - * One of the possible states for {@link Secure#USER_SETUP_PERSONALIZATION_STATE}. - * - * @hide - */ - @SystemApi - public static final int USER_SETUP_PERSONALIZATION_PAUSED = 2; - - /** - * Indicates that the user has completed setup personalization. - * One of the possible states for {@link Secure#USER_SETUP_PERSONALIZATION_STATE}. - * - * @hide - */ - @SystemApi - public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10; - - /** @hide */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({ - USER_SETUP_PERSONALIZATION_NOT_STARTED, - USER_SETUP_PERSONALIZATION_STARTED, - USER_SETUP_PERSONALIZATION_PAUSED, - USER_SETUP_PERSONALIZATION_COMPLETE - }) - public @interface UserSetupPersonalization {} - /** * Activity Extra: Number of certificates * <p> @@ -5650,6 +5603,52 @@ public final class Settings { public static final String USER_SETUP_COMPLETE = "user_setup_complete"; /** + * Indicates that the user has not started setup personalization. + * One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}. + * + * @hide + */ + @SystemApi + public static final int USER_SETUP_PERSONALIZATION_NOT_STARTED = 0; + + /** + * Indicates that the user has not yet completed setup personalization. + * One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}. + * + * @hide + */ + @SystemApi + public static final int USER_SETUP_PERSONALIZATION_STARTED = 1; + + /** + * Indicates that the user has snoozed personalization and will complete it later. + * One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}. + * + * @hide + */ + @SystemApi + public static final int USER_SETUP_PERSONALIZATION_PAUSED = 2; + + /** + * Indicates that the user has completed setup personalization. + * One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}. + * + * @hide + */ + @SystemApi + public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10; + + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({ + USER_SETUP_PERSONALIZATION_NOT_STARTED, + USER_SETUP_PERSONALIZATION_STARTED, + USER_SETUP_PERSONALIZATION_PAUSED, + USER_SETUP_PERSONALIZATION_COMPLETE + }) + public @interface UserSetupPersonalization {} + + /** * Defines the user's current state of device personalization. * The possible states are defined in {@link UserSetupPersonalization}. * |