Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ec196ad authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Using the extracted color for plaecholder loading icons" into ub-launcher3-master

parents 2a067089 577bc6b6
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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">
+4 −1
Original line number Diff line number Diff line
@@ -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