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

Commit e36dae9a authored by Daichi Hirono's avatar Daichi Hirono Committed by android-build-merger
Browse files

Merge "Add config flag to specify if wallpaper is rendered" into pi-dev 

am: c0f8eb34

Change-Id: Icc3778801aad786bc9cd2ee01be93c70b9158c82
parents 7c2c6f36 c0f8eb34

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -1430,6 +1430,9 @@ 
    <!-- True if WallpaperService is enabled -->

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



    <!-- True if the device should block turning display on at boot until wallpaper is ready -->

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



    <!-- Class name of WallpaperManagerService. -->

    <string name="config_wallpaperManagerServiceName">com.android.server.wallpaper.WallpaperManagerService</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ 
  <java-symbol type="bool" name="split_action_bar_is_narrow" />

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

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

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

  <java-symbol type="string" name="config_wallpaperManagerServiceName" />

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

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

services/core/java/com/android/server/wm/DisplayContent.java

+2 −0
Original line number Diff line number Diff line
@@ -2664,6 +2664,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        // wallpaper, don't bother waiting for it

        boolean wallpaperEnabled = mService.mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_enableWallpaperService)

                && mService.mContext.getResources().getBoolean(

                        com.android.internal.R.bool.config_checkWallpaperAtBoot)

                && !mService.mOnlyCore;



        if (DEBUG_SCREEN_ON || DEBUG_BOOT) Slog.i(TAG_WM,