diff options
| author | 2022-08-04 15:19:26 +0000 | |
|---|---|---|
| committer | 2022-08-04 15:19:26 +0000 | |
| commit | 5f9c766269c18a3b63e4f999c9f66f85b56af19e (patch) | |
| tree | 6faa75517f37e602313fcf78817f6b19dc24603a | |
| parent | 9c6631206f6f742356c1b79a88e53fa4bc16130c (diff) | |
| parent | 6c11adfa42f13c768ceafdb9d56c87580d670ebe (diff) | |
Merge "Actually trigger back action on Back Arrow fling" into tm-qpr-dev am: 6c11adfa42
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19484845
Change-Id: I45229c89d7397f3eda033d296b040bc434b0bfd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt index b05e75ea1c97..b44b4def33f4 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt @@ -510,7 +510,6 @@ class BackPanelController private constructor( private fun playCommitBackAnimation() { // Check if we should vibrate again if (previousState != GestureState.FLUNG) { - backCallback.triggerBack() velocityTracker!!.computeCurrentVelocity(1000) val isSlow = abs(velocityTracker!!.xVelocity) < 500 val hasNotVibratedRecently = @@ -519,6 +518,10 @@ class BackPanelController private constructor( vibratorHelper.vibrate(VibrationEffect.EFFECT_CLICK) } } + // Dispatch the actual back trigger + if (DEBUG) Log.d(TAG, "playCommitBackAnimation() invoked triggerBack() on backCallback") + backCallback.triggerBack() + playAnimation(setGoneEndListener) } |