commit a45de07ece42b8dac4d5a99326ebf2d4b72ef267
author Adam Cohen <adamcohen@google.com> Fri Oct 11 16:07:47 2013 -0700
committer Adam Cohen <adamcohen@google.com> Fri Oct 11 16:10:20 2013 -0700
tree 5cb74c3f7866b0c297fddca0978707b012ba4137
parent f7d458543e64307b01de803d2ddfee2f21b0bd28

Fix custom content scroll effects bug (recent regression) (issue 11188769)

Change-Id: Ib90c024daf64baac2ccd1cfd04897d18cd35e111

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 66d4410..edc5fce 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1409,11 +1409,11 @@
         if (hasCustomContent()) {
             int index = mScreenOrder.indexOf(CUSTOM_CONTENT_SCREEN_ID);
 
-            int scrollDelta = getScrollForPage(index + 1) - getScrollX() +
-                    getLayoutTransitionOffsetForPage(index + 1);
-            translationX = scrollDelta;
-            progress = (1.0f * scrollDelta) /
-                    (getScrollForPage(index + 1) - getScrollForPage(index));
+            int scrollDelta = getScrollX() - getScrollForPage(index) -
+                    getLayoutTransitionOffsetForPage(index);
+            float scrollRange = getScrollForPage(index + 1) - getScrollForPage(index);
+            translationX = scrollRange - scrollDelta;
+            progress = (scrollRange - scrollDelta) / scrollRange;
 
             if (isLayoutRtl()) {
                 translationX = Math.min(0, translationX);