commit 323d2a035a06418b40bd8ea285cdb83950888e92
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 20 16:59:01 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 20 16:59:01 2019 +0000
tree 7182c5e5e1c71c61611989acc8add498d3ba7d19
parent 1a67fbfb513362d7c05a4d7f40a413fa0a942aa2
parent 0936531220aba7a1dd30c9978b61b513311595c7

Merge "Custom Theme 6/n: edit custom theme" into ub-launcher3-master

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 4b5fb4a..881d444 100644
--- a/src/com/android/customization/model/theme/DefaultThemeProvider.java
+++ b/src/com/android/customization/model/theme/DefaultThemeProvider.java
@@ -139,12 +139,23 @@
                         mStubApkResources.getIdentifier(TITLE_PREFIX + themeName,
                                 "string", mStubPackageName)));
 
-                String fontOverlayPackage = getOverlayPackage(FONT_PREFIX, themeName);
+                String shapeOverlayPackage = getOverlayPackage(SHAPE_PREFIX, themeName);
+                if (!TextUtils.isEmpty(shapeOverlayPackage)) {
+                    builder.addOverlayPackage(getOverlayCategory(shapeOverlayPackage),
+                            shapeOverlayPackage)
+                            .setShapePath(loadString(CONFIG_ICON_MASK, shapeOverlayPackage))
+                            .setShapePreview(getDrawableResourceAsset(
+                                    PREVIEW_SHAPE_PREFIX, themeName));
+                } else {
+                    builder.setShapePath(mContext.getResources().getString(
+                            Resources.getSystem().getIdentifier(CONFIG_ICON_MASK, "string",
+                                    ANDROID_PACKAGE)));
+                }
 
+                String fontOverlayPackage = getOverlayPackage(FONT_PREFIX, themeName);
                 addFontOverlay(builder, fontOverlayPackage);
 
                 String colorOverlayPackage = getOverlayPackage(COLOR_PREFIX, themeName);
-
                 if (!TextUtils.isEmpty(colorOverlayPackage)) {
                     builder.addOverlayPackage(getOverlayCategory(colorOverlayPackage),
                                 colorOverlayPackage)
@@ -156,20 +167,6 @@
                                     PREVIEW_COLOR_PREFIX, themeName));
                 }
 
-                String shapeOverlayPackage = getOverlayPackage(SHAPE_PREFIX, themeName);
-
-                if (!TextUtils.isEmpty(shapeOverlayPackage)) {
-                    builder.addOverlayPackage(getOverlayCategory(shapeOverlayPackage),
-                                shapeOverlayPackage)
-                            .setShapePath(loadString(CONFIG_ICON_MASK, shapeOverlayPackage))
-                            .setShapePreview(getDrawableResourceAsset(
-                                    PREVIEW_SHAPE_PREFIX, themeName));
-                } else {
-                    builder.setShapePath(mContext.getResources().getString(
-                            Resources.getSystem().getIdentifier(CONFIG_ICON_MASK, "string",
-                                    ANDROID_PACKAGE)));
-                }
-
                 String iconAndroidOverlayPackage = getOverlayPackage(ICON_ANDROID_PREFIX,
                         themeName);