commit 55e87a932b314e27460f64dd4d5264f5f917f35d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 28 21:47:22 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 28 21:47:22 2019 +0000
tree 8b142a87cfa05921879bc8bc3df983c675b0347b
parent 3d3346457509ba9d5c24ecc798051211cb797d08
parent 3e09611f3699b0ddfdbfc5be6eae41f5942ff8ff

Merge "Refactor styles definitions for better readability" into ub-launcher3-qt-r1-dev

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 d8c32ff..0b1dec2 100644
--- a/src/com/android/customization/model/ResourceConstants.java
+++ b/src/com/android/customization/model/ResourceConstants.java
@@ -84,7 +84,8 @@
             "ic_qs_flashlight",
             "ic_qs_auto_rotate",
             "ic_qs_airplane",
-            "ic_signal_cellular_3_4_bar"
+            "ic_signal_cellular_3_4_bar",
+            "ic_battery_80_24dp"
     };
 
     ArrayList<String> sTargetPackages = new ArrayList<>();

src/com/android/customization/picker/theme/ThemePreviewPage.java

diff --git a/src/com/android/customization/picker/theme/ThemePreviewPage.java b/src/com/android/customization/picker/theme/ThemePreviewPage.java
index 224a8f8..47282eb 100644
--- a/src/com/android/customization/picker/theme/ThemePreviewPage.java
+++ b/src/com/android/customization/picker/theme/ThemePreviewPage.java
@@ -82,7 +82,7 @@
          * Maps which icon from ResourceConstants#ICONS_FOR_PREVIEW to use for each icon in the
          * top bar (fake "status bar") of the cover page.
          */
-        private static final int [] sTopBarIconToPreviewIcon = new int [] { 0, 6, 2 };
+        private static final int [] sTopBarIconToPreviewIcon = new int [] { 0, 6, 7 };
 
         private final Typeface mHeadlineFont;
         private final List<Drawable> mIcons;
@@ -194,9 +194,14 @@
             ViewGroup iconsContainer = card.findViewById(R.id.theme_preview_top_bar_icons);
 
             for (int i = 0; i < iconsContainer.getChildCount(); i++) {
-                ((ImageView) iconsContainer.getChildAt(i))
-                        .setImageDrawable(mIcons.get(sTopBarIconToPreviewIcon[i]).getConstantState()
-                                .newDrawable().mutate());
+                int iconIndex = sTopBarIconToPreviewIcon[i];
+                if (iconIndex < mIcons.size()) {
+                    ((ImageView) iconsContainer.getChildAt(i))
+                            .setImageDrawable(mIcons.get(iconIndex).getConstantState()
+                                    .newDrawable().mutate());
+                } else {
+                    iconsContainer.getChildAt(i).setVisibility(View.GONE);
+                }
             }
 
             ViewGroup body = card.findViewById(R.id.theme_preview_card_body_container);