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

Merge "Call BackCallback.setTriggerBack immediately on ACTION_UP" into udc-dev am: af89904fe1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23232636

Change-Id: I215bcf669dc72a84c2915b4727e848f66ebd709d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Marvin Bernal
2023-05-15 21:51:09 +00:00
committed by Automerger Merge Worker
parent 7a624021fb af89904fe1
commit 92cf5e82ee
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,7 +323,6 @@ class BackPanelController internal constructor(
if (isFlungAwayFromEdge(endX = event.x) || if (isFlungAwayFromEdge(endX = event.x) ||
previousXTranslation > params.staticTriggerThreshold previousXTranslation > params.staticTriggerThreshold
) { ) {
updateArrowState(GestureState.ACTIVE)
updateArrowState(GestureState.FLUNG) updateArrowState(GestureState.FLUNG)
} else { } else {
updateArrowState(GestureState.CANCELLED) updateArrowState(GestureState.CANCELLED)
@@ -331,8 +330,11 @@ class BackPanelController internal constructor(
} }
GestureState.INACTIVE -> { GestureState.INACTIVE -> {
if (isFlungAwayFromEdge(endX = event.x)) { if (isFlungAwayFromEdge(endX = event.x)) {
// This is called outside of updateArrowState so that
// BackAnimationController can immediately evaluate state
// instead of after the flung delay
backCallback.setTriggerBack(true)
mainHandler.postDelayed(MIN_DURATION_INACTIVE_BEFORE_FLUNG_ANIMATION) { mainHandler.postDelayed(MIN_DURATION_INACTIVE_BEFORE_FLUNG_ANIMATION) {
updateArrowState(GestureState.ACTIVE)
updateArrowState(GestureState.FLUNG) updateArrowState(GestureState.FLUNG)
} }
} else { } else {

2
packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgePanelParams.kt
View File

@@ -132,7 +132,7 @@ data class EdgePanelParams(private var resources: Resources) {
entryWidthInterpolator = PathInterpolator(.19f, 1.27f, .71f, .86f) entryWidthInterpolator = PathInterpolator(.19f, 1.27f, .71f, .86f)
entryWidthTowardsEdgeInterpolator = PathInterpolator(1f, -3f, 1f, 1.2f) entryWidthTowardsEdgeInterpolator = PathInterpolator(1f, -3f, 1f, 1.2f)
activeWidthInterpolator = PathInterpolator(.56f, -0.39f, .18f, 1.46f) activeWidthInterpolator = PathInterpolator(.7f, -0.24f, .48f, 1.21f)
arrowAngleInterpolator = entryWidthInterpolator arrowAngleInterpolator = entryWidthInterpolator
horizontalTranslationInterpolator = PathInterpolator(0.2f, 1.0f, 1.0f, 1.0f) horizontalTranslationInterpolator = PathInterpolator(0.2f, 1.0f, 1.0f, 1.0f)
verticalTranslationInterpolator = PathInterpolator(.5f, 1.15f, .41f, .94f) verticalTranslationInterpolator = PathInterpolator(.5f, 1.15f, .41f, .94f)