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

Merge "Decrease Back Arrow committed animation duration" into udc-dev am: 7111e1f2c0

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

Change-Id: Id8dd93ff31ddcd39838601b1f1f0be8b78d4b981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Marvin Bernal
2023-03-28 04:45:12 +00:00
committed by Automerger Merge Worker
parent 778c18d8a5 7111e1f2c0
commit a124101bfa
2 changed files with 6 additions and 5 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

@@ -56,7 +56,8 @@ private const val PX_PER_MS = 1
internal const val MIN_DURATION_ACTIVE_BEFORE_INACTIVE_ANIMATION = 300L internal const val MIN_DURATION_ACTIVE_BEFORE_INACTIVE_ANIMATION = 300L
private const val MIN_DURATION_ACTIVE_AFTER_INACTIVE_ANIMATION = 130L private const val MIN_DURATION_ACTIVE_AFTER_INACTIVE_ANIMATION = 130L
private const val MIN_DURATION_CANCELLED_ANIMATION = 200L private const val MIN_DURATION_CANCELLED_ANIMATION = 200L
private const val MIN_DURATION_COMMITTED_ANIMATION = 120L private const val MIN_DURATION_COMMITTED_ANIMATION = 80L
private const val MIN_DURATION_COMMITTED_AFTER_FLING_ANIMATION = 120L
private const val MIN_DURATION_INACTIVE_BEFORE_FLUNG_ANIMATION = 50L private const val MIN_DURATION_INACTIVE_BEFORE_FLUNG_ANIMATION = 50L
private const val MIN_DURATION_FLING_ANIMATION = 160L private const val MIN_DURATION_FLING_ANIMATION = 160L
@@ -918,7 +919,7 @@ class BackPanelController internal constructor(
if (previousState == GestureState.FLUNG) { if (previousState == GestureState.FLUNG) {
updateRestingArrowDimens() updateRestingArrowDimens()
mainHandler.postDelayed(onEndSetGoneStateListener.runnable, mainHandler.postDelayed(onEndSetGoneStateListener.runnable,
MIN_DURATION_COMMITTED_ANIMATION) MIN_DURATION_COMMITTED_AFTER_FLING_ANIMATION)
} else { } else {
mView.popScale(POP_ON_FLING_SCALE) mView.popScale(POP_ON_FLING_SCALE)
mainHandler.postDelayed(onAlphaEndSetGoneStateListener.runnable, mainHandler.postDelayed(onAlphaEndSetGoneStateListener.runnable,

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

@@ -219,7 +219,7 @@ data class EdgePanelParams(private var resources: Resources) {
height = getDimen(R.dimen.navigation_edge_active_background_height), height = getDimen(R.dimen.navigation_edge_active_background_height),
edgeCornerRadius = getDimen(R.dimen.navigation_edge_active_edge_corners), edgeCornerRadius = getDimen(R.dimen.navigation_edge_active_edge_corners),
farCornerRadius = getDimen(R.dimen.navigation_edge_active_far_corners), farCornerRadius = getDimen(R.dimen.navigation_edge_active_far_corners),
widthSpring = createSpring(650f, 0.75f), widthSpring = createSpring(850f, 0.75f),
heightSpring = createSpring(10000f, 1f), heightSpring = createSpring(10000f, 1f),
edgeCornerRadiusSpring = createSpring(600f, 0.36f), edgeCornerRadiusSpring = createSpring(600f, 0.36f),
farCornerRadiusSpring = createSpring(2500f, 0.855f), farCornerRadiusSpring = createSpring(2500f, 0.855f),
@@ -274,8 +274,8 @@ data class EdgePanelParams(private var resources: Resources) {
farCornerRadiusSpring = flungCommittedFarCornerSpring, farCornerRadiusSpring = flungCommittedFarCornerSpring,
alphaSpring = createSpring(1400f, 1f), alphaSpring = createSpring(1400f, 1f),
), ),
scale = 0.85f, scale = 0.86f,
scaleSpring = createSpring(6000f, 1f), scaleSpring = createSpring(5700f, 1f),
) )
flungIndicator = committedIndicator.copy( flungIndicator = committedIndicator.copy(