Merge "Base: Remove unused triggerThreshold field" into udc-dev
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java
index 133fd87..53a438e 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java
@@ -55,10 +55,9 @@
/**
* 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.
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
index dc27ceb..6d879b8 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
@@ -301,9 +301,9 @@
}
@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 @@
mTouchTracker.setTriggerBack(triggerBack);
}
- private void setSwipeThresholds(float triggerThreshold, float progressThreshold) {
+ private void setSwipeThresholds(float progressThreshold) {
mTouchTracker.setProgressThreshold(progressThreshold);
}
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
index 9a1efc3..42de7f0 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
@@ -224,8 +224,6 @@
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 @@
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 @@
return;
}
mBackAnimation.setSwipeThresholds(
- mBackSwipeTriggerThreshold,
Math.min(mDisplaySize.x, mBackSwipeProgressThreshold));
}