diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-09-29 18:37:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-29 18:37:39 -0700 |
| commit | 579a34186f801f7d70ac05feb380b1a3480e6d31 (patch) | |
| tree | 069331a2fd4479868c68403bea8d4d7f5f0faeb9 | |
| parent | a8901439e72a2fa32a05fae6c38bb8a0c0b23dbf (diff) | |
| parent | 35ef6aae304e4b62f492a2ac7f05c986c7fe6a6b (diff) | |
| download | android_packages_apps_Trebuchet-579a34186f801f7d70ac05feb380b1a3480e6d31.tar.gz android_packages_apps_Trebuchet-579a34186f801f7d70ac05feb380b1a3480e6d31.tar.bz2 android_packages_apps_Trebuchet-579a34186f801f7d70ac05feb380b1a3480e6d31.zip | |
am 35ef6aae: am 0655904a: Fixing regression in reordering (issue 10994971)
* commit '35ef6aae304e4b62f492a2ac7f05c986c7fe6a6b':
Fixing regression in reordering (issue 10994971)
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 9cfb3d911..41687d383 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -925,12 +925,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc mFirstLayout = false; } - if (isPageMoving()) { - // If the page is moving, then snap it to the final position to ensure we don't get - // stuck between pages - snapToDestination(); - } - if (childCount > 0) { final int index = isLayoutRtl() ? 0 : childCount - 1; mMaxScrollX = getScrollForPage(index); @@ -2324,6 +2318,11 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc loadAssociatedPages(mCurrentPage, immediateAndOnly); requestLayout(); } + if (isPageMoving()) { + // If the page is moving, then snap it to the final position to ensure we don't get + // stuck between pages + snapToDestination(); + } } // Animate the drag view back to the original position |