commit 0f1f79449fa78f7cb24570030996ab85f473edb1
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 05 01:10:47 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 05 01:10:47 2019 +0000
tree a2783d02cc5501298eb8bc9f6a2d7935ad8eae47
parent 38675745e97d0aada07edc00ef6fa66a3a747576
parent 74a1a683b9086273b7bf5fc1913eec967eafe601

Merge "Fix color preview icons in custom theme" into ub-launcher3-master

src/com/android/customization/model/theme/custom/ColorOptionsProvider.java

diff --git a/src/com/android/customization/model/theme/custom/ColorOptionsProvider.java b/src/com/android/customization/model/theme/custom/ColorOptionsProvider.java
index b9b35dc..dd61f00 100644
--- a/src/com/android/customization/model/theme/custom/ColorOptionsProvider.java
+++ b/src/com/android/customization/model/theme/custom/ColorOptionsProvider.java
@@ -20,6 +20,7 @@
 import static com.android.customization.model.ResourceConstants.ANDROID_PACKAGE;
 import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ANDROID_THEME;
 import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_COLOR;
+import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_ANDROID;
 import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_SYSUI;
 import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_SHAPE;
 import static com.android.customization.model.ResourceConstants.PATH_SIZE;
@@ -73,7 +74,7 @@
     protected void loadOptions() {
         List<Drawable> previewIcons = new ArrayList<>();
         String iconPackage =
-                mCustomThemeManager.getOverlayPackages().get(OVERLAY_CATEGORY_ICON_SYSUI);
+                mCustomThemeManager.getOverlayPackages().get(OVERLAY_CATEGORY_ICON_ANDROID);
         if (TextUtils.isEmpty(iconPackage)) {
             iconPackage = SYSUI_PACKAGE;
         }