summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2019-04-04 14:50:29 -0700
committerSunny Goyal <sunnygoyal@google.com>2019-04-04 15:05:15 -0700
commit577bc6b66045017f5f1c0acfb067ca83bf9b2652 (patch)
tree4da4b0d943a2bba8fe176ef46fae8e7cad86f845 /src
parent077df72acca237385f52b3557b70c30e3cb5d0b9 (diff)
downloadandroid_packages_apps_Trebuchet-577bc6b66045017f5f1c0acfb067ca83bf9b2652.tar.gz
android_packages_apps_Trebuchet-577bc6b66045017f5f1c0acfb067ca83bf9b2652.tar.bz2
android_packages_apps_Trebuchet-577bc6b66045017f5f1c0acfb067ca83bf9b2652.zip
Using the extracted color for plaecholder loading icons
Bug: 111142970 Change-Id: Id274ddcd20d8042a4cc24bff9d65bea79846e9af
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java b/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java
index 5f2fb596a..23745cbd9 100644
--- a/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java
+++ b/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java
@@ -15,6 +15,8 @@
*/
package com.android.launcher3.graphics;
+import static androidx.core.graphics.ColorUtils.compositeColors;
+
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
@@ -47,7 +49,8 @@ public class PlaceHolderIconDrawable extends FastBitmapDrawable {
super(b, iconColor);
mProgressPath = progressPath;
- mPaint.setColor(Themes.getAttrColor(context, R.attr.loadingIconColor));
+ mPaint.setColor(compositeColors(
+ Themes.getAttrColor(context, R.attr.loadingIconColor), iconColor));
}
@Override