summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/PagedViewIcon.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-01-19 05:10:43 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-19 05:10:43 -0800
commitdcb4eddebe43374f6c4c968cf8114ad1551b127b (patch)
tree4cd438b7a12c6cc5f5df0dd9c216b2ba0ea0340b /src/com/android/launcher2/PagedViewIcon.java
parentaa15ffe60e28b923ebf3e3162ce427ca6feae803 (diff)
parent621fbe56a83aa4e6dc571a458643e3422a6ccf30 (diff)
downloadandroid_packages_apps_Trebuchet-dcb4eddebe43374f6c4c968cf8114ad1551b127b.tar.gz
android_packages_apps_Trebuchet-dcb4eddebe43374f6c4c968cf8114ad1551b127b.tar.bz2
android_packages_apps_Trebuchet-dcb4eddebe43374f6c4c968cf8114ad1551b127b.zip
Merge "Simplify code for All Apps touch feedback"
Diffstat (limited to 'src/com/android/launcher2/PagedViewIcon.java')
-rw-r--r--src/com/android/launcher2/PagedViewIcon.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/com/android/launcher2/PagedViewIcon.java b/src/com/android/launcher2/PagedViewIcon.java
index 331bc147b..548b39458 100644
--- a/src/com/android/launcher2/PagedViewIcon.java
+++ b/src/com/android/launcher2/PagedViewIcon.java
@@ -50,15 +50,7 @@ public class PagedViewIcon extends TextView {
}
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();
}
}