diff options
| author | Winson Chung <winsonc@google.com> | 2013-09-26 14:48:44 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-09-26 16:17:07 -0700 |
| commit | 780fe59a7af8b12fbdcd7f6841edaa7f2c2e019d (patch) | |
| tree | a9181750afb09049eda9f69c205f8af1ceb10c24 /src/com/android/launcher3/PagedView.java | |
| parent | 88cc3f5aa2e9ac3ae0b24e563a44d320cc089cd8 (diff) | |
| download | android_packages_apps_Trebuchet-780fe59a7af8b12fbdcd7f6841edaa7f2c2e019d.tar.gz android_packages_apps_Trebuchet-780fe59a7af8b12fbdcd7f6841edaa7f2c2e019d.tar.bz2 android_packages_apps_Trebuchet-780fe59a7af8b12fbdcd7f6841edaa7f2c2e019d.zip | |
Integrating some aosp fixes, ensuring that we update the install queue before returning to Launcher.
- Fixing stuck page in All Apps (Bug 9347818)
- Fixing shortcuts to uninstalled apps from being installed (Bug 10726510)
- Consolidating vibration feedback
- Ensuring that we trim names during comparison in AllApps list
Change-Id: Ieaae4d85851ce771283b4684a8a60306da28cb3b
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 42f3cace6..8cdd8e2cc 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -925,6 +925,12 @@ 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); |