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/DefaultThemeProvider.java

diff --git a/src/com/android/customization/model/theme/DefaultThemeProvider.java b/src/com/android/customization/model/theme/DefaultThemeProvider.java
index 794f068..3eef4c9 100644
--- a/src/com/android/customization/model/theme/DefaultThemeProvider.java
+++ b/src/com/android/customization/model/theme/DefaultThemeProvider.java
@@ -101,7 +101,7 @@
         mOverlayInfos = new HashMap<>();
 
         Consumer<OverlayInfo> addToMap = overlayInfo -> mOverlayInfos.put(
-                overlayInfo.packageName, overlayInfo);
+                overlayInfo.getPackageName(), overlayInfo);
 
         UserHandle user = UserHandle.of(UserHandle.myUserId());
         om.getOverlayInfosForTarget(ANDROID_PACKAGE, user).forEach(addToMap);
@@ -538,7 +538,7 @@
     @Nullable
     private String getOverlayCategory(String packageName) {
        OverlayInfo info = mOverlayInfos.get(packageName);
-       return info != null ? info.category : null;
+       return info != null ? info.getCategory() : null;
     }
 
     @Override

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

diff --git a/src/com/android/customization/model/theme/OverlayManagerCompat.java b/src/com/android/customization/model/theme/OverlayManagerCompat.java
index 8cca1ff..202a0d4 100644
--- a/src/com/android/customization/model/theme/OverlayManagerCompat.java
+++ b/src/com/android/customization/model/theme/OverlayManagerCompat.java
@@ -72,8 +72,8 @@
         List<OverlayInfo> overlayInfos = getOverlayInfosForTarget(targetPackageName,
                 UserHandle.myUserId());
         for (OverlayInfo overlayInfo : overlayInfos) {
-            if (category.equals(overlayInfo.category) && overlayInfo.isEnabled()) {
-                return overlayInfo.packageName;
+            if (category.equals(overlayInfo.getCategory()) && overlayInfo.isEnabled()) {
+                return overlayInfo.getPackageName();
             }
         }
         return null;
@@ -98,8 +98,8 @@
         for (String target : targetPackages) {
             for (OverlayInfo info
                     : mOverlayByUser.get(userId).getOrDefault(target, Collections.emptyList())) {
-                if (category.equals(info.category)) {
-                    overlays.add(info.packageName);
+                if (category.equals(info.getCategory())) {
+                    overlays.add(info.getPackageName());
                 }
             }
         }
@@ -128,7 +128,7 @@
         // Can't use mOverlayByUser map as the enabled state might change
         for (OverlayInfo overlayInfo : getOverlayInfosForTarget(target, UserHandle.myUserId())) {
             if (overlayInfo.isEnabled()) {
-                overlays.put(overlayInfo.category, overlayInfo.packageName);
+                overlays.put(overlayInfo.getCategory(), overlayInfo.getPackageName());
             }
         }
     }