From adcf5948bbef0a8c1be75808d8579a0782b623e7 Mon Sep 17 00:00:00 2001
From: omarmt <omarmt@google.com>
Date: Wed, 12 Apr 2023 13:42:13 +0000
Subject: [PATCH] Base: Remove unused triggerThreshold field

Test: mp droid
Bug: 271508045
Change-Id: I900bd8ddea99fc7cdbdc040d17a3febfe30f8ac1
---
 .../Shell/src/com/android/wm/shell/back/BackAnimation.java  | 5 ++---
 .../com/android/wm/shell/back/BackAnimationController.java  | 6 +++---
 .../navigationbar/gestural/EdgeBackGestureHandler.java      | 5 -----
 3 files changed, 5 insertions(+), 11 deletions(-)

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 133fd87a2f63c..53a438ec2fded 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 @@ 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.
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 dc27ceb7f51cb..6d879b830e2e7 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 @@ 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);
     }
 
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 9a1efc3d64568..42de7f0f3a8b4 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 @@ 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));
     }