mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-04 01:46:49 +00:00
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:
@@ -191,9 +191,7 @@ public class BubbleTextView extends TextView
|
||||
|
||||
private void applyIconAndLabel(Bitmap icon, ItemInfo info) {
|
||||
FastBitmapDrawable iconDrawable = mLauncher.createIconDrawable(icon);
|
||||
if (info.isDisabled()) {
|
||||
iconDrawable.setState(FastBitmapDrawable.State.DISABLED);
|
||||
}
|
||||
iconDrawable.setIsDisabled(info.isDisabled());
|
||||
setIcon(iconDrawable);
|
||||
setText(info.title);
|
||||
if (info.contentDescription != null) {
|
||||
@@ -262,10 +260,7 @@ public class BubbleTextView extends TextView
|
||||
private void updateIconState() {
|
||||
if (mIcon instanceof FastBitmapDrawable) {
|
||||
FastBitmapDrawable d = (FastBitmapDrawable) mIcon;
|
||||
if (getTag() instanceof ItemInfo
|
||||
&& ((ItemInfo) getTag()).isDisabled()) {
|
||||
d.animateState(FastBitmapDrawable.State.DISABLED);
|
||||
} else if (isPressed() || mStayPressed) {
|
||||
if (isPressed() || mStayPressed) {
|
||||
d.animateState(FastBitmapDrawable.State.PRESSED);
|
||||
} else {
|
||||
d.animateState(FastBitmapDrawable.State.NORMAL);
|
||||
|
||||
Reference in New Issue
Block a user