diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 516f49ccc910a..b2c2d0e20d649 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3299,6 +3299,14 @@ public final class Settings { */ public static final int SCREEN_BRIGHTNESS_MODE_AUTOMATIC = 1; + /** + * Control whether to enable adaptive sleep mode. + * @hide + */ + public static final String ADAPTIVE_SLEEP = "adaptive_sleep"; + + private static final Validator ADAPTIVE_SLEEP_VALIDATOR = BOOLEAN_VALIDATOR; + /** * Control whether the process CPU usage meter should be shown. * @@ -4232,6 +4240,7 @@ public final class Settings { SCREEN_BRIGHTNESS_MODE, SCREEN_AUTO_BRIGHTNESS_ADJ, SCREEN_BRIGHTNESS_FOR_VR, + ADAPTIVE_SLEEP, VIBRATE_INPUT_DEVICES, MODE_RINGER_STREAMS_AFFECTED, TEXT_AUTO_REPLACE, @@ -4307,6 +4316,7 @@ public final class Settings { PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS); PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_FOR_VR); PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_MODE); + PUBLIC_SETTINGS.add(ADAPTIVE_SLEEP); PUBLIC_SETTINGS.add(MODE_RINGER_STREAMS_AFFECTED); PUBLIC_SETTINGS.add(MUTE_STREAMS_AFFECTED); PUBLIC_SETTINGS.add(VIBRATE_ON); @@ -4411,6 +4421,7 @@ public final class Settings { VALIDATORS.put(SCREEN_OFF_TIMEOUT, SCREEN_OFF_TIMEOUT_VALIDATOR); VALIDATORS.put(SCREEN_BRIGHTNESS_FOR_VR, SCREEN_BRIGHTNESS_FOR_VR_VALIDATOR); VALIDATORS.put(SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_VALIDATOR); + VALIDATORS.put(ADAPTIVE_SLEEP, ADAPTIVE_SLEEP_VALIDATOR); VALIDATORS.put(MODE_RINGER_STREAMS_AFFECTED, MODE_RINGER_STREAMS_AFFECTED_VALIDATOR); VALIDATORS.put(MUTE_STREAMS_AFFECTED, MUTE_STREAMS_AFFECTED_VALIDATOR); VALIDATORS.put(VIBRATE_ON, VIBRATE_ON_VALIDATOR); diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 75038c8d00fbe..7aee5fbf2543b 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -705,6 +705,9 @@ Software implementation will be used if config_hardware_auto_brightness_available is not set --> false + + false + false diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 8867539b02ae5..dfe0440d6046f 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1845,6 +1845,7 @@ + diff --git a/proto/src/metrics_constants/metrics_constants.proto b/proto/src/metrics_constants/metrics_constants.proto index 8261fe89f778d..f56320f5d2d50 100644 --- a/proto/src/metrics_constants/metrics_constants.proto +++ b/proto/src/metrics_constants/metrics_constants.proto @@ -6820,6 +6820,10 @@ message MetricsEvent { // OS: Q MOBILE_NETWORK_LIST = 1627; + // OPEN: Settings > Display > Adaptive sleep + // OS: Q + SETTINGS_ADAPTIVE_SLEEP = 1628; + // ---- End Q Constants, all Q constants go above this line ---- // Add new aosp constants above this line. // END OF AOSP CONSTANTS