commit 9fee641640938b6b245e513df471747eef999c97
author Jon Miranda <jonmiranda@google.com> Fri Jun 04 18:29:33 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 04 18:29:33 2021 +0000
tree 6d0782f79371a01572eef76c86bcc280b9a24802
parent 426abeee6d8790605a854d6cb0c7811c7fa44f4f
parent ecaa3818eb160084c63222e8b80346ca82f3fa1d

Update ThemedIconDrawable to spec. am: ecaa3818eb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/14845163

Change-Id: Ifd5e38112dd3b0c4a58c4efcadfd3cc75fa4efd0

iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java

diff --git a/iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java b/iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java
index 8969587..b2e554b 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java
@@ -41,7 +41,6 @@
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.icons.BitmapInfo.Extender;
-import com.android.launcher3.icons.ClockDrawableWrapper.ClockBitmapInfo;
 import com.android.launcher3.icons.cache.BaseIconCache;
 
 import java.io.ByteArrayInputStream;
@@ -286,8 +285,8 @@
         Resources res = context.getResources();
         int[] colors = new int[2];
         if ((res.getConfiguration().uiMode & UI_MODE_NIGHT_MASK) == UI_MODE_NIGHT_YES) {
-            colors[0] = GraphicsUtils.getAttrColor(context, android.R.attr.colorBackgroundFloating);
-            colors[1] = GraphicsUtils.getAttrColor(context, android.R.attr.colorAccent);
+            colors[0] = res.getColor(android.R.color.system_neutral1_800);
+            colors[1] = res.getColor(android.R.color.system_accent1_100);
         } else {
             colors[0] = res.getColor(android.R.color.system_accent1_100);
             colors[1] = res.getColor(android.R.color.system_neutral2_700);