diff options
3 files changed, 54 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f91056dbce30..ba87c831895b 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -10617,6 +10617,57 @@ public final class Settings { public static final String GLANCEABLE_HUB_ENABLED = "glanceable_hub_enabled"; /** + * Indicates that glanceable hub should never be started automatically. + * + * @hide + */ + public static final int GLANCEABLE_HUB_START_NEVER = 0; + + /** + * Indicates that glanceable hub should be started when charging. + * + * @hide + */ + public static final int GLANCEABLE_HUB_START_CHARGING = 1; + + /** + * Indicates that glanceable hub should be started when charging and upright. + * + * @hide + */ + public static final int GLANCEABLE_HUB_START_CHARGING_UPRIGHT = 2; + + /** + * Indicates that glanceable hub should be started when docked. + * + * @hide + */ + public static final int GLANCEABLE_HUB_START_DOCKED = 3; + + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({ + GLANCEABLE_HUB_START_NEVER, + GLANCEABLE_HUB_START_CHARGING, + GLANCEABLE_HUB_START_CHARGING_UPRIGHT, + GLANCEABLE_HUB_START_DOCKED, + }) + public @interface WhenToStartGlanceableHub { + } + + /** + * Indicates when to start glanceable hub. Possible values are: + * 0: Never + * 1: While charging always + * 2: While upright and charging + * 3: While docked + * + * @hide + */ + public static final String WHEN_TO_START_GLANCEABLE_HUB = + "when_to_start_glanceable_hub"; + + /** * Whether home controls are enabled to be shown over the screensaver by the user. * * @hide diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index f0a0483aa17c..aed4d3fca5fc 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -267,6 +267,7 @@ public class SecureSettings { Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED, Settings.Secure.HUB_MODE_TUTORIAL_STATE, Settings.Secure.GLANCEABLE_HUB_ENABLED, + Settings.Secure.WHEN_TO_START_GLANCEABLE_HUB, Settings.Secure.STYLUS_BUTTONS_ENABLED, Settings.Secure.STYLUS_HANDWRITING_ENABLED, Settings.Secure.DEFAULT_NOTE_TASK_PROFILE, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index b5de7e719043..86193389c026 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -430,6 +430,8 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.DND_CONFIGS_MIGRATED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.HUB_MODE_TUTORIAL_STATE, NON_NEGATIVE_INTEGER_VALIDATOR); VALIDATORS.put(Secure.GLANCEABLE_HUB_ENABLED, new InclusiveIntegerRangeValidator(0, 1)); + VALIDATORS.put(Secure.WHEN_TO_START_GLANCEABLE_HUB, + new InclusiveIntegerRangeValidator(0, 3)); VALIDATORS.put(Secure.STYLUS_BUTTONS_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.STYLUS_HANDWRITING_ENABLED, new DiscreteValueValidator(new String[] {"-1", "0", "1"})); |