Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70675448 authored by Lucas Silva's avatar Lucas Silva Committed by Android (Google) Code Review
Browse files

Merge changes from topic "383208131" into main 

* changes:
  Add postured dream setting
  Add new setting for enabling screensavers while postured.
parents a694a2b8 f57b5416

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -10524,6 +10524,15 @@ public final class Settings { 
        @Readable

        public static final String SCREENSAVER_ACTIVATE_ON_SLEEP = "screensaver_activate_on_sleep";













        /**













         * If screensavers are enabled, whether the screensaver should be













         * automatically launched when the device is stationary and upright.













         * @hide













         */













        @Readable













        public static final String SCREENSAVER_ACTIVATE_ON_POSTURED =













                "screensaver_activate_on_postured";



























        /**















         * If screensavers are enabled, the default screensaver component.















         * @hide

































core/java/android/service/dreams/flags.aconfig



+7
−0




























Original line number
Diff line number
Diff line








@@ -77,3 +77,10 @@ flag {













        purpose: PURPOSE_BUGFIX















    }















}



























flag {













    name: "allow_dream_when_postured"













    namespace: "systemui"













    description: "Allow dreaming when device is stationary and upright"













    bug: "383208131"













}
























core/proto/android/providers/settings/secure.proto



+1
−0




























Original line number
Diff line number
Diff line








@@ -580,6 +580,7 @@ message SecureSettingsProto {













        optional SettingProto activate_on_dock = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto activate_on_sleep = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto default_component = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto activate_on_postured = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];















    }















    optional Screensaver screensaver = 47;

















































core/res/res/values/config.xml



+3
−0




























Original line number
Diff line number
Diff line








@@ -2766,6 +2766,9 @@













    <bool name="config_dreamsActivatedOnDockByDefault">true</bool>















    <!-- If supported and enabled, are dreams activated when asleep and charging? (by default) -->















    <bool name="config_dreamsActivatedOnSleepByDefault">false</bool>













    <!-- If supported and enabled, are dreams enabled while device is stationary and upright?













         (by default) -->













    <bool name="config_dreamsActivatedOnPosturedByDefault">false</bool>















    <!-- ComponentName of the default dream (Settings.Secure.DEFAULT_SCREENSAVER_COMPONENT) -->















    <string name="config_dreamsDefaultComponent" translatable="false">com.android.deskclock/com.android.deskclock.Screensaver</string>















    <!-- ComponentNames of the dreams that we should hide -->

































core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -2330,6 +2330,7 @@













  <java-symbol type="bool" name="config_dreamsEnabledOnBattery" />















  <java-symbol type="bool" name="config_dreamsActivatedOnDockByDefault" />















  <java-symbol type="bool" name="config_dreamsActivatedOnSleepByDefault" />













  <java-symbol type="bool" name="config_dreamsActivatedOnPosturedByDefault" />















  <java-symbol type="integer" name="config_dreamsBatteryLevelMinimumWhenPowered" />















  <java-symbol type="integer" name="config_dreamsBatteryLevelMinimumWhenNotPowered" />















  <java-symbol type="integer" name="config_dreamsBatteryLevelDrainCutoff" />