summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-01-21 07:48:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-01-21 07:48:35 +0000
commit2c1e1df8becb0c42eb3e9ef6a629c3e6f447aef7 (patch)
treec6be43fdf269fd8c6bac922d9bfa4cfe153e2d37
parent494a39099ad651ac994908df19edf82646e195cd (diff)
parent1471bedb0a464ac5766ca0b7215eeafae197d2e9 (diff)
downloadsystemui-2c1e1df8becb0c42eb3e9ef6a629c3e6f447aef7.tar.gz
Merge "Fixing badge not disabled when disabling app"
-rw-r--r--iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.java b/iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.java
index 8a1ad44..cb74867 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.java
@@ -274,7 +274,7 @@ public class FastBitmapDrawable extends Drawable implements Drawable.Callback {
mBadge.setCallback(this);
}
updateBadgeBounds(getBounds());
- invalidateSelf();
+ updateFilter();
}
/**
@@ -282,6 +282,9 @@ public class FastBitmapDrawable extends Drawable implements Drawable.Callback {
*/
protected void updateFilter() {
mPaint.setColorFilter(mIsDisabled ? getDisabledColorFilter(mDisabledAlpha) : mColorFilter);
+ if (mBadge != null) {
+ mBadge.setColorFilter(getColorFilter());
+ }
invalidateSelf();
}