diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-10-21 00:18:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-21 00:18:25 +0000 |
| commit | 5c6f99e29077aea5ab946e2ec30a5705e95a822b (patch) | |
| tree | 0a456f51918c30bbc759e800cd5b9b26b6ac81f6 /src/com/android/launcher3/BubbleTextView.java | |
| parent | c2bc0ef1c313698fd931fc84ec2f11882c38cdba (diff) | |
| parent | cd5b7f9fc64aebabe5a037f4a3376802209c1aa2 (diff) | |
| download | android_packages_apps_Trebuchet-5c6f99e29077aea5ab946e2ec30a5705e95a822b.tar.gz android_packages_apps_Trebuchet-5c6f99e29077aea5ab946e2ec30a5705e95a822b.tar.bz2 android_packages_apps_Trebuchet-5c6f99e29077aea5ab946e2ec30a5705e95a822b.zip | |
Merge "Fixing disabled icon getting changed back to normal state on long press" into ub-launcher3-burnaby-polish
Diffstat (limited to 'src/com/android/launcher3/BubbleTextView.java')
| -rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 70bf85992..c8f5a4594 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -252,6 +252,9 @@ public class BubbleTextView extends TextView FastBitmapDrawable d = (FastBitmapDrawable) mIcon; if (isPressed() || mStayPressed) { d.animateState(FastBitmapDrawable.State.PRESSED); + } else if (getTag() instanceof ShortcutInfo + && ((ShortcutInfo) getTag()).isDisabled != 0) { + d.animateState(FastBitmapDrawable.State.DISABLED); } else { d.animateState(FastBitmapDrawable.State.NORMAL); } |