diff options
-rw-r--r-- | res/values/styles.xml | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 252cae146..ec63e3597 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -44,7 +44,7 @@ <item name="widgetsTheme">@style/WidgetContainerTheme</item> <item name="folderDotColor">?android:attr/colorPrimary</item> <item name="folderIconBorderColor">?android:attr/colorPrimary</item> - <item name="loadingIconColor">#FFF</item> + <item name="loadingIconColor">#CCFFFFFF</item> <item name="android:windowTranslucentStatus">false</item> <item name="android:windowTranslucentNavigation">false</item> @@ -82,7 +82,7 @@ <item name="folderDotColor">#FF464646</item> <item name="folderIconBorderColor">#FF80868B</item> <item name="isMainColorDark">true</item> - <item name="loadingIconColor">#000</item> + <item name="loadingIconColor">#99FFFFFF</item> </style> <style name="LauncherTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark"> 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 |