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

Commit 1a6e52d3 authored by William Xiao's avatar William Xiao Committed by Android (Google) Code Review
Browse files

Merge "Add config for default value for restrict dream to wireless charing" into main

parents c2eac76c e175c757

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2864,6 +2864,8 @@ 
    <bool name="config_dreamsOnlyEnabledForDockUser">false</bool>

    <!-- Whether dreams are disabled when ambient mode is suppressed. -->

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

    <!-- Whether to restrict dreams to wireless charging. -->

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



    <!-- The default for the setting that controls when to auto-start hub mode.

          0 means "never" -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2362,6 +2362,7 @@ 
  <java-symbol type="string" name="config_dreamsDefaultComponent" />

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

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

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

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

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

  <java-symbol type="array" name="config_supportedDreamComplications" />

packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java

+6 −3
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ public class DreamBackend { 
    private final boolean mDreamsActivatedOnSleepByDefault;

    private final boolean mDreamsActivatedOnDockByDefault;

    private final boolean mDreamsActivatedOnPosturedByDefault;

    private final boolean mDreamOnlyOnWirelssChargingDefault;

    private final boolean mLowLightDisplayBehaviorEnabledDefault;

    private final int mLowLightDisplayBehaviorDefault;

    private final Set<ComponentName> mDisabledDreams;
@@ -184,6 +185,8 @@ public class DreamBackend { 
                com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault);

        mDreamsActivatedOnPosturedByDefault = resources.getBoolean(

                com.android.internal.R.bool.config_dreamsActivatedOnPosturedByDefault);

        mDreamOnlyOnWirelssChargingDefault = resources.getBoolean(

                com.android.internal.R.bool.config_onlyDreamWhenWirelessChargingDefault);

        mLowLightDisplayBehaviorEnabledDefault = resources.getBoolean(

                com.android.internal.R.bool.config_lowLightDisplayBehaviorEnabledDefault);

        mLowLightDisplayBehaviorDefault = resources.getInteger(
@@ -440,9 +443,9 @@ public class DreamBackend { 


    /** Get whether to restrict showing dreams to only when charging wirelessly. */

    public boolean getRestrictToWirelessCharging() {

        return Settings.Secure.getInt(

                mContext.getContentResolver(),

                Settings.Secure.SCREENSAVER_RESTRICT_TO_WIRELESS_CHARGING, 0) == 1;

        return Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.SCREENSAVER_RESTRICT_TO_WIRELESS_CHARGING,

                mDreamOnlyOnWirelssChargingDefault ? 1 : 0) == 1;

    }



    /** Gets all dream complications which are supported on this device. **/

services/core/java/com/android/server/dreams/DreamManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -282,8 +282,8 @@ public final class DreamManagerService extends SystemService { 
                com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault);

        mDreamsActivatedOnPosturedByDefault = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_dreamsActivatedOnPosturedByDefault);

        // TODO(b/407768891): use default config when added.

        mOnlyDreamOnWirelessChargingDefault = false;

        mOnlyDreamOnWirelessChargingDefault = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_onlyDreamWhenWirelessChargingDefault);

        mSettingsObserver = new SettingsObserver(mHandler);

        mKeepDreamingWhenUnpluggingDefault = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_keepDreamingWhenUnplugging);

services/core/java/com/android/server/power/PowerManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -1552,8 +1552,7 @@ public final class PowerManagerService extends SystemService 
        mDreamsActivatedWhilePosturedByDefaultConfig = resources.getBoolean(

                com.android.internal.R.bool.config_dreamsActivatedOnPosturedByDefault);

        mDreamsActivatedOnlyWhileWirelessChargingConfig = resources.getBoolean(

                com.android.internal.R.bool.config_onlyShowGlanceableHubWhenWirelessChargingDefault

        );

                com.android.internal.R.bool.config_onlyDreamWhenWirelessChargingDefault);

        mDreamsEnabledOnBatteryConfig = resources.getBoolean(

                com.android.internal.R.bool.config_dreamsEnabledOnBattery);

        mDreamsBatteryLevelMinimumWhenPoweredConfig = resources.getInteger(