commit 2d6209e962325a0ef13ca11901b453bb4ec60e61
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 01 22:26:16 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 01 22:26:16 2019 +0000
tree fac5fc63cebc0e57d7b9d6edb3d135c065108b92
parent d30b020adb166cedb0402f20965fe92751271ddc
parent 000e7cabe584e9d156494555334b29d7ff3b3bbf

Merge "Update icon names" into ub-launcher3-master

src/com/android/customization/model/ResourceConstants.java

diff --git a/src/com/android/customization/model/ResourceConstants.java b/src/com/android/customization/model/ResourceConstants.java
index 1b52ec9..8ef4fa1 100644
--- a/src/com/android/customization/model/ResourceConstants.java
+++ b/src/com/android/customization/model/ResourceConstants.java
@@ -73,11 +73,11 @@
     String CONFIG_HEADLINE_FONT_FAMILY = "config_headlineFontFamily";
     String[] ICONS_FOR_PREVIEW = {
             "ic_wifi_signal_3",
-            "ic_qs_bluetooth_on",
-            "ic_dnd",
-            "ic_signal_flashlight",
+            "ic_qs_bluetooth",
+            "ic_qs_dnd",
+            "ic_qs_flashlight",
             "ic_qs_auto_rotate",
-            "ic_signal_airplane"
+            "ic_qs_airplane"
     };
 
     ArrayList<String> sTargetPackages = new ArrayList<>();

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 82afdce..794f068 100644
--- a/src/com/android/customization/model/theme/DefaultThemeProvider.java
+++ b/src/com/android/customization/model/theme/DefaultThemeProvider.java
@@ -244,7 +244,7 @@
     private void addSysUiIconOverlay(Builder builder, String iconSysUiOverlayPackage)
             throws NameNotFoundException {
         if (!TextUtils.isEmpty(iconSysUiOverlayPackage)) {
-            addIconOverlay(builder, iconSysUiOverlayPackage, ICONS_FOR_PREVIEW);
+            addIconOverlay(builder, iconSysUiOverlayPackage);
         }
     }