summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-04-26 13:29:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-26 13:29:03 -0700
commit4773408efd8bd3b33c97d9512ac8b0742f319c70 (patch)
tree01b28db7c7170b538f8dfc9875c29cfb879248c5 /src
parentc9b5d2b9808653a94a4d830d5fb2f0ecda958f1e (diff)
parentd167e2a09f90e5a9a1fe44125b77f879f806615d (diff)
downloadandroid_packages_apps_Trebuchet-4773408efd8bd3b33c97d9512ac8b0742f319c70.tar.gz
android_packages_apps_Trebuchet-4773408efd8bd3b33c97d9512ac8b0742f319c70.tar.bz2
android_packages_apps_Trebuchet-4773408efd8bd3b33c97d9512ac8b0742f319c70.zip
Merge "Fixing issue where side pages in all apps were showing. (Bug 6393199)" into jb-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/AppsCustomizePagedView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 00a35a50f..7b71ff47e 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -1421,7 +1421,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
float alpha;
- if (!LauncherApplication.isScreenLarge() || scrollProgress < 0) {
+ if (scrollProgress < 0) {
alpha = scrollProgress < 0 ? mAlphaInterpolator.getInterpolation(
1 - Math.abs(scrollProgress)) : 1.0f;
} else {