Merge "Decrease Back Arrow committed animation duration" into udc-dev

This commit is contained in:
Marvin Bernal
2023-03-28 04:36:17 +00:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 5 deletions

View File

@@ -56,7 +56,8 @@ private const val PX_PER_MS = 1
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_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_FLING_ANIMATION = 160L
@@ -918,7 +919,7 @@ class BackPanelController internal constructor(
if (previousState == GestureState.FLUNG) {
updateRestingArrowDimens()
mainHandler.postDelayed(onEndSetGoneStateListener.runnable,
MIN_DURATION_COMMITTED_ANIMATION)
MIN_DURATION_COMMITTED_AFTER_FLING_ANIMATION)
} else {
mView.popScale(POP_ON_FLING_SCALE)
mainHandler.postDelayed(onAlphaEndSetGoneStateListener.runnable,

View File

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