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

Commit 2b3f0b4c authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Config to disable AOD wallpapers"

parents be0afe72 a2f2fbe5

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2125,6 +2125,9 @@ 
         during initialization when the setting is still null. -->

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



    <!-- If AOD can show an ambient version of the wallpaper -->

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



    <!-- Whether the display blanks itself when transitioning from a doze to a non-doze state -->

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

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3310,6 +3310,7 @@ 
  <java-symbol type="integer" name="config_autoGroupAtCount" />

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

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

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

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

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

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

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+4 −2
Original line number Diff line number Diff line
@@ -474,8 +474,10 @@ public class StatusBar extends SystemUI implements DemoMode, 
                return;

            }

            WallpaperInfo info = wallpaperManager.getWallpaperInfo(UserHandle.USER_CURRENT);

            final boolean supportsAmbientMode = info != null &&

                    info.supportsAmbientMode();

            final boolean deviceSupportsAodWallpaper = mContext.getResources().getBoolean(

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

            final boolean supportsAmbientMode = deviceSupportsAodWallpaper

                    && info != null && info.supportsAmbientMode();



            mStatusBarWindowController.setWallpaperSupportsAmbientMode(supportsAmbientMode);

            mScrimController.setWallpaperSupportsAmbientMode(supportsAmbientMode);