commit 736d3ab9f806cc919816054ec3df9bd005729012
author Hyunyoung Song <hyunyoungs@google.com> Fri Mar 08 00:58:44 2019 -0800
committer Hyunyoung Song <hyunyoungs@google.com> Fri Mar 08 00:58:44 2019 -0800
tree e9e1888e45121735d5bb85753c281b7773079f1b
parent 87ed7f8ef6b623072d95fbe2f450c50ea9eceb96

DefaultThemeProvider should support launcher icon packs

Bug: 126738409
Change-Id: I50c5c28fb1752bb66a1d25352098add5677e7cec

src/com/android/customization/model/theme/DefaultThemeProvider.java

diff --git a/src/com/android/customization/model/theme/DefaultThemeProvider.java b/src/com/android/customization/model/theme/DefaultThemeProvider.java
index 3ba8f55..a841f87 100644
--- a/src/com/android/customization/model/theme/DefaultThemeProvider.java
+++ b/src/com/android/customization/model/theme/DefaultThemeProvider.java
@@ -65,6 +65,7 @@
     private static final String COLOR_PREFIX = "theme_overlay_color_";
     private static final String SHAPE_PREFIX = "theme_overlay_shape_";
     private static final String ICON_ANDROID_PREFIX = "theme_overlay_icon_android_";
+    private static final String ICON_LAUNCHER_PREFIX = "theme_overlay_icon_launcher_";
     private static final String ICON_SETTINGS_PREFIX = "theme_overlay_icon_settings_";
     private static final String ICON_SYSUI_PREFIX = "theme_overlay_icon_sysui_";
     private static final String ICON_PREVIEW_DRAWABLE_NAME = "ic_wifi_signal_3";
@@ -194,6 +195,13 @@
                     }
                 }
 
+                String iconLauncherOverlayPackage = getOverlayPackage(ICON_LAUNCHER_PREFIX,
+                        themeName);
+                if (!TextUtils.isEmpty(iconLauncherOverlayPackage)) {
+                    builder.addOverlayPackage(getOverlayCategory(iconLauncherOverlayPackage),
+                            iconLauncherOverlayPackage);
+                }
+
                 String iconSettingsOverlayPackage = getOverlayPackage(ICON_SETTINGS_PREFIX,
                         themeName);