commit b1f93cceb831e6eb1b7c5eac3707e1a281599322
author Winson Chung <winsonc@google.com> Thu Apr 26 13:33:14 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 26 13:33:14 2012 -0700
tree 01b28db7c7170b538f8dfc9875c29cfb879248c5
parent 29d0431cac2d82c7a8fff8e8a22ac6478a2a1f43
parent 4773408efd8bd3b33c97d9512ac8b0742f319c70

am 4773408e: Merge "Fixing issue where side pages in all apps were showing. (Bug 6393199)" into jb-dev

* commit '4773408efd8bd3b33c97d9512ac8b0742f319c70':
  Fixing issue where side pages in all apps were showing. (Bug 6393199)

src/com/android/launcher2/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 00a35a5..7b71ff4 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -1421,7 +1421,7 @@
 
                 float alpha;
 
-                if (!LauncherApplication.isScreenLarge() || scrollProgress < 0) {
+                if (scrollProgress < 0) {
                     alpha = scrollProgress < 0 ? mAlphaInterpolator.getInterpolation(
                         1 - Math.abs(scrollProgress)) : 1.0f;
                 } else {