Merge "Don't notifyPageSwitchListener until page settles (issue 12069757)" into jb-ub-now-kermit (309260ee) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/PagedView.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -449,6 +449,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) {
		@@ -523,6 +527,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
		*/
		void stopScrolling() {
		mCurrentPage = getNextPage();
		notifyPageSwitchListener();
		forceFinishScroller();
		}

		@@ -572,11 +577,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());
		@@ -2230,7 +2243,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) {

src/com/android/launcher3/Workspace.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1200,7 +1200,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;