summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/SmoothPagedView.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-07-18 16:45:45 -0700
committerAdam Cohen <adamcohen@google.com>2013-07-18 16:47:23 -0700
commitedb4076e59861d0c343e7245f247e2bee6d48159 (patch)
tree2d327a027b63e4d164941fdcc7b08fa531516624 /src/com/android/launcher3/SmoothPagedView.java
parentf698c6ebda06997aae998e262ab1714c625ff3b1 (diff)
downloadandroid_packages_apps_Trebuchet-edb4076e59861d0c343e7245f247e2bee6d48159.tar.gz
android_packages_apps_Trebuchet-edb4076e59861d0c343e7245f247e2bee6d48159.tar.bz2
android_packages_apps_Trebuchet-edb4076e59861d0c343e7245f247e2bee6d48159.zip
More PagedView cleanup
-> Custom content screen is now full screen (with some padding inserted for now) -> Hiding the hotseat and page indicators when scrolling to the custom content screen -> Adding background scrim fade in to custom content space. Change-Id: I28921318a38af46f11fa836020a590c70d5d96ed
Diffstat (limited to 'src/com/android/launcher3/SmoothPagedView.java')
-rw-r--r--src/com/android/launcher3/SmoothPagedView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/SmoothPagedView.java b/src/com/android/launcher3/SmoothPagedView.java
index 1beffacb5..a45dbbf6e 100644
--- a/src/com/android/launcher3/SmoothPagedView.java
+++ b/src/com/android/launcher3/SmoothPagedView.java
@@ -130,7 +130,7 @@ public abstract class SmoothPagedView extends PagedView {
whichPage = Math.max(0, Math.min(whichPage, getChildCount() - 1));
final int screenDelta = Math.max(1, Math.abs(whichPage - mCurrentPage));
- final int newX = getChildOffset(whichPage) - getRelativeChildOffset(whichPage);
+ final int newX = getScrollForPage(whichPage);
final int delta = newX - mUnboundedScrollX;
int duration = (screenDelta + 1) * 100;