Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Actually trigger back action on Back Arrow fling" into tm-qpr-dev am: 6c11adfa42

Browse Source 
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>
This commit is contained in:
Rahul Banerjee
2022-08-04 15:19:26 +00:00
committed by Automerger Merge Worker
parent 9c6631206f 6c11adfa42
commit 5f9c766269
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt
View File

@@ -510,7 +510,6 @@ class BackPanelController private constructor(
private fun playCommitBackAnimation() { private fun playCommitBackAnimation() {
// Check if we should vibrate again // Check if we should vibrate again
if (previousState != GestureState.FLUNG) { if (previousState != GestureState.FLUNG) {
backCallback.triggerBack()
velocityTracker!!.computeCurrentVelocity(1000) velocityTracker!!.computeCurrentVelocity(1000)
val isSlow = abs(velocityTracker!!.xVelocity) < 500 val isSlow = abs(velocityTracker!!.xVelocity) < 500
val hasNotVibratedRecently = val hasNotVibratedRecently =
@@ -519,6 +518,10 @@ class BackPanelController private constructor(
vibratorHelper.vibrate(VibrationEffect.EFFECT_CLICK) vibratorHelper.vibrate(VibrationEffect.EFFECT_CLICK)
} }
} }
// Dispatch the actual back trigger
if (DEBUG) Log.d(TAG, "playCommitBackAnimation() invoked triggerBack() on backCallback")
backCallback.triggerBack()
playAnimation(setGoneEndListener) playAnimation(setGoneEndListener)
} }