diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-10-21 00:21:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-21 00:21:47 +0000 |
| commit | cd320352036b767aa2f75d7df5b01ff52cf90d76 (patch) | |
| tree | 3a154dbae7eaff3106c2603d9ee237dc500cf143 /src/com/android/launcher3/BubbleTextView.java | |
| parent | 0b9aec98f4a71bb3ecfe7ecd5270aae9be38e39d (diff) | |
| parent | 5c6f99e29077aea5ab946e2ec30a5705e95a822b (diff) | |
| download | android_packages_apps_Trebuchet-cd320352036b767aa2f75d7df5b01ff52cf90d76.tar.gz android_packages_apps_Trebuchet-cd320352036b767aa2f75d7df5b01ff52cf90d76.tar.bz2 android_packages_apps_Trebuchet-cd320352036b767aa2f75d7df5b01ff52cf90d76.zip | |
Merge "Fixing disabled icon getting changed back to normal state on long press" into ub-launcher3-burnaby-polish
am: 5c6f99e290
* commit '5c6f99e29077aea5ab946e2ec30a5705e95a822b':
Fixing disabled icon getting changed back to normal state on long press
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 10db45945..a3b92dcf7 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); } |