diff options
author | Adam Cohen <adamcohen@google.com> | 2013-12-13 15:07:14 -0800 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-12-13 15:59:01 -0800 |
commit | 674531f26196502db825838b21b9cbf34463088c (patch) | |
tree | 7f10fc528ed6d84f43e80ab9c393a2748143c929 | |
parent | 4de0974c460ce6439cce7931fb0ba945095a4b94 (diff) | |
download | android_packages_apps_Trebuchet-674531f26196502db825838b21b9cbf34463088c.tar.gz android_packages_apps_Trebuchet-674531f26196502db825838b21b9cbf34463088c.tar.bz2 android_packages_apps_Trebuchet-674531f26196502db825838b21b9cbf34463088c.zip |
Don't notifyPageSwitchListener until page settles (issue 12069757)
-> Should address the dismiss timer not working quite right
Change-Id: I63ad32d8f7c37f1a090ff1dd6024eeb7c0c6ce65
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 17 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 1e4f4fa7f..fa52f52b1 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -451,6 +451,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc return new PageIndicator.PageMarkerResources(); } + /** + * Add a page change listener which will be called when a page is _finished_ listening. + * + */ public void setPageSwitchListener(PageSwitchListener pageSwitchListener) { mPageSwitchListener = pageSwitchListener; if (mPageSwitchListener != null) { @@ -525,6 +529,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc */ void stopScrolling() { mCurrentPage = getNextPage(); + notifyPageSwitchListener(); forceFinishScroller(); } @@ -574,11 +579,19 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc return mRestorePage; } + /** + * Should be called whenever the page changes. In the case of a scroll, we wait until the page + * has settled. + */ protected void notifyPageSwitchListener() { if (mPageSwitchListener != null) { - mPageSwitchListener.onPageSwitch(getPageAt(mCurrentPage), mCurrentPage); + mPageSwitchListener.onPageSwitch(getPageAt(getNextPage()), getNextPage()); } + updatePageIndicator(); + } + + private void updatePageIndicator() { // Update the page indicator (when we aren't reordering) if (mPageIndicator != null && !isReordering(false)) { mPageIndicator.setActiveMarker(getNextPage()); @@ -2232,7 +2245,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc mScroller.startScroll(mUnboundedScrollX, 0, delta, 0, duration); - notifyPageSwitchListener(); + updatePageIndicator(); // Trigger a compute() to finish switching pages if necessary if (immediate) { diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 52420b73b..6b719b258 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1209,7 +1209,7 @@ public class Workspace extends SmoothPagedView @Override protected void notifyPageSwitchListener() { super.notifyPageSwitchListener(); - Launcher.setScreen(mCurrentPage); + Launcher.setScreen(getNextPage()); if (hasCustomContent() && getNextPage() == 0 && !mCustomContentShowing) { mCustomContentShowing = true; |