commit d3e4f63231605c0a5b5355c2f193c06b3697ef2f
author Tianguang Zhang <tianguang@google.com> Wed Apr 14 00:30:15 2021 +0200
committer Tianguang Zhang <tianguang@google.com> Mon Apr 19 16:06:38 2021 +0200
tree 26f8eed2f8f0b259c3bdd18d9b360d42938ec9c5
parent b26fc436b5461d1ed2bdada28d0385b3f2c2ef47

Remove hard-coded colors in Wallpaper Picker

The CLs in this topic remove the hard-coded colors from the app, replacing them with ?android:attr/, ?attr/, and sometimes @color/ that is defined using device default colors.

Fixes: 173549815
Test: none added
Change-Id: I9fa38334b36d971fe74775cfededcdf567112308

src/com/android/wallpaper/picker/CategorySelectorFragment.java

diff --git a/src/com/android/wallpaper/picker/CategorySelectorFragment.java b/src/com/android/wallpaper/picker/CategorySelectorFragment.java
index 8ea0af4..485727f 100644
--- a/src/com/android/wallpaper/picker/CategorySelectorFragment.java
+++ b/src/com/android/wallpaper/picker/CategorySelectorFragment.java
@@ -48,6 +48,7 @@
 import com.android.wallpaper.module.UserEventLogger;
 import com.android.wallpaper.util.DeepLinkUtils;
 import com.android.wallpaper.util.DisplayMetricsRetriever;
+import com.android.wallpaper.util.ResourceUtils;
 import com.android.wallpaper.util.SizeCalculator;
 import com.android.wallpaper.widget.WallpaperPickerRecyclerViewAccessibilityDelegate;
 import com.android.wallpaper.widget.WallpaperPickerRecyclerViewAccessibilityDelegate.BottomSheetHost;
@@ -330,7 +331,10 @@
             Asset thumbnail = mCategory.getThumbnail(getActivity().getApplicationContext());
             if (thumbnail != null) {
                 thumbnail.loadDrawable(getActivity(), mImageView,
-                        getResources().getColor(R.color.secondary_color));
+                        ResourceUtils.getColorAttr(
+                            getActivity(),
+                            android.R.attr.colorSecondary
+                        ));
             } else {
                 // TODO(orenb): Replace this workaround for b/62584914 with a proper way of
                 //  unloading the ImageView such that no incorrect image is improperly loaded upon
@@ -376,7 +380,10 @@
             super(view);
             ProgressBar progressBar = view.findViewById(R.id.loading_indicator);
             progressBar.getIndeterminateDrawable().setColorFilter(
-                    getResources().getColor(R.color.accent_color), PorterDuff.Mode.SRC_IN);
+                    ResourceUtils.getColorAttr(
+                            getActivity(),
+                            android.R.attr.colorAccent
+                    ), PorterDuff.Mode.SRC_IN);
         }
     }