From b6d686dcebc19e78c82b12151f4e983c39c35aee Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Fri, 29 Mar 2019 10:49:43 -0700 Subject: [PATCH] Add disabled boolean to FastBitmapDrawable constant state. Bug: 129328259 Change-Id: I70c1fc6d786b3fd2c51129624b947b313df69e7f --- .../android/launcher3/FastBitmapDrawable.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java index 964e8b6856..7ab88a0083 100644 --- a/src/com/android/launcher3/FastBitmapDrawable.java +++ b/src/com/android/launcher3/FastBitmapDrawable.java @@ -103,9 +103,14 @@ public class FastBitmapDrawable extends Drawable { } protected FastBitmapDrawable(Bitmap b, int iconColor) { + this(b, iconColor, false); + } + + protected FastBitmapDrawable(Bitmap b, int iconColor, boolean isDisabled) { mBitmap = b; mIconColor = iconColor; setFilterBitmap(true); + setIsDisabled(isDisabled); } @Override @@ -249,6 +254,10 @@ public class FastBitmapDrawable extends Drawable { } } + protected boolean isDisabled() { + return mIsDisabled; + } + /** * Sets the saturation of this icon, 0 [full color] -> 1 [desaturated] */ @@ -338,21 +347,23 @@ public class FastBitmapDrawable extends Drawable { @Override public ConstantState getConstantState() { - return new MyConstantState(mBitmap, mIconColor); + return new MyConstantState(mBitmap, mIconColor, mIsDisabled); } protected static class MyConstantState extends ConstantState { protected final Bitmap mBitmap; protected final int mIconColor; + protected final boolean mIsDisabled; - public MyConstantState(Bitmap bitmap, int color) { + public MyConstantState(Bitmap bitmap, int color, boolean isDisabled) { mBitmap = bitmap; mIconColor = color; + mIsDisabled = isDisabled; } @Override public Drawable newDrawable() { - return new FastBitmapDrawable(mBitmap, mIconColor); + return new FastBitmapDrawable(mBitmap, mIconColor, mIsDisabled); } @Override