summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rahul Banerjee <rahulbanerjee@google.com> 2022-07-08 19:01:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-08 19:01:15 +0000
commit3e258e97a94d607d8a320879c2effd897ad2487b (patch)
treea925f461d3d6e345b588cbce34d36375a186cacb
parent70f1cc62d8e6964a68f7b2d5629b56140e6b9a93 (diff)
parent6614ba3011d2d6ea81d124321e8082fd09bf8c67 (diff)
Merge "Fix "appearance glitch" in Back Arrow" into tm-qpr-dev am: bb691ff048 am: 6614ba3011
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19211684 Change-Id: I09004778a9a47e8f46787ba46f3d6b00fd11e5a8 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.kt5
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 8179d1763ea1..a83367059736 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt
@@ -321,7 +321,10 @@ class BackPanelController private constructor(
velocityTracker = null
}
MotionEvent.ACTION_CANCEL -> {
- updateArrowState(GestureState.CANCELLED)
+ // Receiving a CANCEL implies that something else intercepted
+ // the gesture, i.e., the user did not cancel their gesture.
+ // Therefore, disappear immediately, with minimum fanfare.
+ updateArrowState(GestureState.GONE)
velocityTracker = null
}
}