Merge "Base: Remove unused triggerThreshold field" into udc-dev (f636d7c5) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -55,10 +55,9 @@ public interface BackAnimation {

		/**
		* Sets the threshold values that defining edge swipe behavior.
		* @param triggerThreshold the min threshold to trigger back.
		* @param progressThreshold the max threshold to keep progressing back animation.
		* @param progressThreshold the max threshold to keep linear progressing back animation.
		*/
		void setSwipeThresholds(float triggerThreshold, float progressThreshold);
		void setSwipeThresholds(float progressThreshold);

		/**
		* Sets the system bar listener to control the system bar color.

+3 −3

Original line number	Diff line number	Diff line
		@@ -301,9 +301,9 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		}

		@Override
		public void setSwipeThresholds(float triggerThreshold, float progressThreshold) {
		public void setSwipeThresholds(float progressThreshold) {
		mShellExecutor.execute(() -> BackAnimationController.this.setSwipeThresholds(
		triggerThreshold, progressThreshold));
		progressThreshold));
		}

		@Override
		@@ -605,7 +605,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		mTouchTracker.setTriggerBack(triggerBack);
		}

		private void setSwipeThresholds(float triggerThreshold, float progressThreshold) {
		private void setSwipeThresholds(float progressThreshold) {
		mTouchTracker.setProgressThreshold(progressThreshold);
		}

+0 −5

Original line number	Diff line number	Diff line
		@@ -224,8 +224,6 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
		private float mBottomGestureHeight;
		// The slop to distinguish between horizontal and vertical motion
		private float mTouchSlop;
		// The threshold for triggering back
		private float mBackSwipeTriggerThreshold;
		// The threshold for back swipe full progress.
		private float mBackSwipeProgressThreshold;
		// Duration after which we consider the event as longpress.
		@@ -473,8 +471,6 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
		final float backGestureSlop = DeviceConfig.getFloat(DeviceConfig.NAMESPACE_SYSTEMUI,
		SystemUiDeviceConfigFlags.BACK_GESTURE_SLOP_MULTIPLIER, 0.75f);
		mTouchSlop = mViewConfiguration.getScaledTouchSlop() * backGestureSlop;
		mBackSwipeTriggerThreshold = res.getDimension(
		R.dimen.navigation_edge_action_drag_threshold);
		mBackSwipeProgressThreshold = res.getDimension(
		R.dimen.navigation_edge_action_progress_threshold);
		updateBackAnimationThresholds();
		@@ -1121,7 +1117,6 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
		return;
		}
		mBackAnimation.setSwipeThresholds(
		mBackSwipeTriggerThreshold,
		Math.min(mDisplaySize.x, mBackSwipeProgressThreshold));
		}