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

Merge "Rename default wallpaper per device color config"

Browse Source
This commit is contained in:
Austin Wang
2023-07-05 16:46:47 +00:00
committed by Android (Google) Code Review
parent 942cc4a8c0 9015b6aca2
commit a29fa8c58e
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/WallpaperManager.java
View File

@@ -2928,7 +2928,7 @@ public class WallpaperManager {
public static ComponentName getCmfDefaultWallpaperComponent(Context context) {
ComponentName cn = null;
String[] cmfWallpaperMap = context.getResources().getStringArray(
com.android.internal.R.array.cmf_default_wallpaper_component);
com.android.internal.R.array.default_wallpaper_component_per_device_color);
if (cmfWallpaperMap == null || cmfWallpaperMap.length == 0) {
Log.d(TAG, "No CMF wallpaper config");
return getDefaultWallpaperComponent(context);

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

@@ -1863,13 +1863,14 @@
specified -->
<string name="default_wallpaper_component" translatable="false">@null</string>
<!-- CMF colors to default wallpaper component map, the component with color matching the device
color will be the cmf default wallpapers. The default wallpaper will be default wallpaper
component if not specified.
<!-- Default wallpaper component per device color map, each item is a comma separated key-value
pair with key being a device color and value being the corresponding wallpaper component.
The component with its key matching the device color will be the default wallpaper, the
default wallpaper component will be the default if this config is not specified.
E.g. for SLV color, and com.android.example/com.android.example.SlVDefaultWallpaper
<item>SLV,com.android.example/com.android.example.SlVDefaultWallpaper</item> -->
<string-array name="cmf_default_wallpaper_component" translatable="false">
<string-array name="default_wallpaper_component_per_device_color" translatable="false">
<!-- Add packages here -->
</string-array>

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

@@ -2126,7 +2126,7 @@
<java-symbol type="string" name="data_usage_rapid_body" />
<java-symbol type="string" name="data_usage_rapid_app_body" />
<java-symbol type="string" name="default_wallpaper_component" />
<java-symbol type="array" name="cmf_default_wallpaper_component" />
<java-symbol type="array" name="default_wallpaper_component_per_device_color" />
<java-symbol type="string" name="device_storage_monitor_notification_channel" />
<java-symbol type="string" name="dlg_ok" />
<java-symbol type="string" name="dump_heap_notification" />