Merge "Prevent quickscrub when swipe up has already started" (cb77b79f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture
		@Override
		public void onRecentsAnimationStarted() {
		mRecentsAnimationStarted = true;
		mQuickScrubController.cancelQuickSwitch();
		mQuickScrubController.setRecentsAnimationStarted(true /* started */);
		}
		};

		@@ -163,6 +163,7 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture
		mNavigationBarView.transformMatrixToGlobal(mTransformGlobalMatrix);
		mNavigationBarView.transformMatrixToLocal(mTransformLocalMatrix);
		mRecentsAnimationStarted = false;
		mQuickScrubController.setRecentsAnimationStarted(false /* started */);
		break;
		}
		}

+9 −1

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene
		private boolean mDraggingActive;
		private boolean mQuickScrubActive;
		private boolean mAllowQuickSwitch;
		private boolean mRecentsAnimationStarted;
		private float mDownOffset;
		private float mTranslation;
		private int mTouchDownX;
		@@ -279,7 +280,7 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene
		}

		// Control the button movement
		if (!mDraggingActive && exceededTouchSlop) {
		if (!mDraggingActive && exceededTouchSlop && !mRecentsAnimationStarted) {
		boolean allowDrag = !mDragPositive
		? offset < 0 && pos < touchDown : offset >= 0 && pos > touchDown;
		if (allowDrag) {
		@@ -417,6 +418,13 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene
		mDraggingActive = false;
		}

		public void setRecentsAnimationStarted(boolean started) {
		mRecentsAnimationStarted = started;
		if (started) {
		cancelQuickSwitch();
		}
		}

		public void cancelQuickSwitch() {
		mAllowQuickSwitch = false;
		mHandler.removeCallbacks(mLongPressRunnable);