diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-11 23:22:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-11 23:22:11 +0000 |
| commit | 1226be4398d848fe59ddf9718d9a2939ae5b8e43 (patch) | |
| tree | b0f4c27064b443699cc734227fcff0504f9393dc /src | |
| parent | dc734ef2c0a7152b0ada9425fd54c556128f3be4 (diff) | |
| parent | a45de07ece42b8dac4d5a99326ebf2d4b72ef267 (diff) | |
| download | android_packages_apps_Trebuchet-1226be4398d848fe59ddf9718d9a2939ae5b8e43.tar.gz android_packages_apps_Trebuchet-1226be4398d848fe59ddf9718d9a2939ae5b8e43.tar.bz2 android_packages_apps_Trebuchet-1226be4398d848fe59ddf9718d9a2939ae5b8e43.zip | |
Merge "Fix custom content scroll effects bug (recent regression) (issue 11188769)" into jb-ub-now-indigo-rose
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 5205bef23..688acafad 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1431,11 +1431,11 @@ public class Workspace extends SmoothPagedView 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); |