Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-02 00:19:24 +00:00
committed by Android (Google) Code Review
parent da6cff4e08 c143222407
commit c0f8eb345a
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/config.xml
View File

@@ -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>

1
core/res/res/values/symbols.xml
View File

@@ -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" />

2
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -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,