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

Commit a29fa8c5 authored by Austin Wang's avatar Austin Wang Committed by Android (Google) Code Review
Browse files

Merge "Rename default wallpaper per device color config"

parents 942cc4a8 9015b6ac

core/java/android/app/WallpaperManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/res/res/values/config.xml

+5 −4
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />