diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-11-09 17:20:41 -0800 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-11-11 11:38:53 -0800 |
| commit | ebea84d1c95f4c38ba8cee46cd586fd757b4fce2 (patch) | |
| tree | 6278e0e16611db2a59bfd5a481636e0efee9bb0f /src/com/android/launcher2/AppsCustomizePagedView.java | |
| parent | 31234d811dc69c159757a6890852eb0f53d559a9 (diff) | |
| download | android_packages_apps_Trebuchet-ebea84d1c95f4c38ba8cee46cd586fd757b4fce2.tar.gz android_packages_apps_Trebuchet-ebea84d1c95f4c38ba8cee46cd586fd757b4fce2.tar.bz2 android_packages_apps_Trebuchet-ebea84d1c95f4c38ba8cee46cd586fd757b4fce2.zip | |
Unifying overscroll btw phone and tablet
-> Using separate assets for removing and uninstalling
Change-Id: I183967c3ca482531ae28f71cd9053b673c6a8d03
Diffstat (limited to 'src/com/android/launcher2/AppsCustomizePagedView.java')
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 8ef758d55..5382ef3be 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -1265,7 +1265,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen scale = 1.0f; alpha = 1.0f; // On the first page, we don't want the page to have any lateral motion - translationX = getScrollX(); + translationX = 0; } else if (i == getChildCount() - 1 && scrollProgress > 0) { // Overscroll to the right v.setPivotX((1 - TRANSITION_PIVOT) * pageWidth); @@ -1273,7 +1273,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen scale = 1.0f; alpha = 1.0f; // On the last page, we don't want the page to have any lateral motion. - translationX = getScrollX() - mMaxScrollX; + translationX = 0; } else { v.setPivotY(pageHeight / 2.0f); v.setPivotX(pageWidth / 2.0f); |