commit d6371244620c2c32811a4727384c8a4283f31ca2
author Adam Cohen <adamcohen@google.com> Fri Jul 19 23:38:50 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 19 23:38:50 2013 +0000
tree dda70f9102ba3743d3dba64579b34e43b0803c3e
parent 3e056d13d2bddc83d30abfd6a8ea17807188d07f
parent 955806dfc49aa793a386722800be9433f94c5563

Merge "Just for now, for fun" into jb-ub-gel-agar

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 0865411..7eed3f0 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1327,14 +1327,16 @@
 
             float progress = (1.0f * scrollDelta) /
                     (getScrollForPage(index + 1) - getScrollForPage(index));
+            progress = Math.max(0, progress);
 
             setBackgroundAlpha(progress * 0.8f);
+            float transY = progress * (getViewportHeight() - getPageIndicator().getTop());
 
             if (mLauncher.getHotseat() != null) {
-                mLauncher.getHotseat().setTranslationX(translationX);
+                mLauncher.getHotseat().setTranslationY(transY);
             }
             if (getPageIndicator() != null) {
-                getPageIndicator().setTranslationX(translationX);
+                getPageIndicator().setAlpha(1 - progress);
             }
         }
     }