Revert "Merge commit '8d14dbe041199d611839140f1c9285fd4174e9f4' ..."
Revert "Merging from ub-launcher3-master @ build 6877130"
Revert "Merging from ub-launcher3-master @ build 6877130"
Revert "Merging from ub-launcher3-master @ build 6877130"
Revert submission 12738409-merge_ub-launcher3-master_6877130
Reason for revert: Introduced crashes to global presubmit
Reverted Changes:
I624658ce6:Merge commit '8d14dbe041199d611839140f1c9285fd4174...
Iccd2f1e3a:Merging from ub-launcher3-master @ build 6877130
I791d64951:Merging from ub-launcher3-master @ build 6877130
Icdd32ab01:Merging from ub-launcher3-master @ build 6877130
Bug: 169963211
Change-Id: I77a4ae59e823147beae8dd7cb9b54ccdace2c7f4
diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
index 139d4a8..d3b86de 100644
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -33,8 +33,6 @@
import android.graphics.drawable.Drawable;
import android.util.Property;
-import androidx.annotation.Nullable;
-
import com.android.launcher3.graphics.PlaceHolderIconDrawable;
import com.android.launcher3.icons.BitmapInfo;
import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -56,8 +54,6 @@
protected Bitmap mBitmap;
protected final int mIconColor;
- @Nullable private ColorFilter mColorFilter;
-
private boolean mIsPressed;
private boolean mIsDisabled;
private float mDisabledAlpha = 1f;
@@ -119,8 +115,7 @@
@Override
public void setColorFilter(ColorFilter cf) {
- mColorFilter = cf;
- updateFilter();
+ // No op
}
@Override
@@ -270,7 +265,7 @@
* Updates the paint to reflect the current brightness and saturation.
*/
protected void updateFilter() {
- mPaint.setColorFilter(mIsDisabled ? getDisabledColorFilter() : mColorFilter);
+ mPaint.setColorFilter(mIsDisabled ? getDisabledColorFilter() : null);
invalidateSelf();
}