Merge "Fix bug where taskbar jumps when double swiping up." into tm-qpr-dev (9e593747) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -76,12 +76,11 @@ public class TaskbarTranslationController implements TaskbarControllers.Loggable
		/**
		* Called to cancel any existing animations.
		*/
		public void cancelAnimationIfExists() {
		public void cancelSpringIfExists() {
		if (mSpringBounce != null) {
		mSpringBounce.cancel();
		mSpringBounce = null;
		}
		reset();
		}

		private void updateTranslationYForSwipe() {
		@@ -144,7 +143,8 @@ public class TaskbarTranslationController implements TaskbarControllers.Loggable
		animator.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationStart(Animator animation) {
		cancelAnimationIfExists();
		cancelSpringIfExists();
		reset();
		mAnimationToHomeRunning = true;
		}

		@@ -162,6 +162,18 @@ public class TaskbarTranslationController implements TaskbarControllers.Loggable
		*/
		public class TransitionCallback {

		/**
		* Clears any existing animations so that user
		* can take control over the movement of the taskbaer.
		*/
		public void onActionDown() {
		if (mAnimationToHomeRunning) {
		mTranslationYForSwipe.cancelAnimation();
		}
		mAnimationToHomeRunning = false;
		cancelSpringIfExists();
		reset();
		}
		/**
		* Called when there is movement to move the taskbar.
		*/

+4 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,10 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer {
		mCanceledUnstashHint = false;
		}
		}

		if (mTransitionCallback != null && !mIsTaskbarAllAppsOpen) {
		mTransitionCallback.onActionDown();
		}
		break;
		case MotionEvent.ACTION_POINTER_UP:
		int ptrIdx = ev.getActionIndex();