Keep disabled FastBitmapDrawables disabled while fast scrolling.

Previously, they were animating to be colored because they were
set to have a FAST_SCROLL_UNLHIGHLIGHTED state. Now they retain
their disabled color when changing fast scroll states.

Specfically, we remove the DISABLED state and instead make it a
property of the FastBitmapDrawable.

Bug: 32642959
Change-Id: I6cb2da134a550c267eebfc756eff8c91a33f028c
This commit is contained in:
Tony Wickham committed 2016-11-11 10:59:17 -08:00
1 parent f4a0d1886f
commit 6b910a235d
4 files changed
+27 -20

No files matched your search

@@ -177,10 +177,8 @@ public class PreloadIconDrawable extends Drawable {
// Set the paint color only when the level changes, so that the dominant color
// is only calculated when needed.
mPaint.setColor(getIndicatorColor());
}
if (mIcon instanceof FastBitmapDrawable) {
((FastBitmapDrawable) mIcon).setState(level <= 0 ?
FastBitmapDrawable.State.DISABLED : FastBitmapDrawable.State.NORMAL);
} else if (mIcon instanceof FastBitmapDrawable) {
((FastBitmapDrawable) mIcon).setIsDisabled(true);
}
invalidateSelf();