commit dcb4eddebe43374f6c4c968cf8114ad1551b127b
author Michael Jurka <mikejurka@google.com> Thu Jan 19 05:10:43 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 19 05:10:43 2012 -0800
tree 4cd438b7a12c6cc5f5df0dd9c216b2ba0ea0340b
parent aa15ffe60e28b923ebf3e3162ce427ca6feae803
parent 621fbe56a83aa4e6dc571a458643e3422a6ccf30

Merge "Simplify code for All Apps touch feedback"

src/com/android/launcher2/PagedViewIcon.java

diff --git a/src/com/android/launcher2/PagedViewIcon.java b/src/com/android/launcher2/PagedViewIcon.java
index 331bc14..548b394 100644
--- a/src/com/android/launcher2/PagedViewIcon.java
+++ b/src/com/android/launcher2/PagedViewIcon.java
@@ -50,15 +50,7 @@
     }
 
     protected void drawableStateChanged() {
-        if (isPressed()) {
-            if (getAlpha() != 0.5f) {
-                setAlpha(0.5f);
-            }
-        } else {
-            if (getAlpha() != 1f) {
-                setAlpha(1f);
-            }
-        }
+        setAlpha(isPressed() ? 0.5f : 1f);
         super.drawableStateChanged();
     }
 }