commit cd320352036b767aa2f75d7df5b01ff52cf90d76
author Sunny Goyal <sunnygoyal@google.com> Wed Oct 21 00:21:47 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 21 00:21:47 2015 +0000
tree 3a154dbae7eaff3106c2603d9ee237dc500cf143
parent 0b9aec98f4a71bb3ecfe7ecd5270aae9be38e39d
parent 5c6f99e29077aea5ab946e2ec30a5705e95a822b

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

src/com/android/launcher3/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 10db459..a3b92dc 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -252,6 +252,9 @@
             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);
             }