Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4e294cb authored by Marvin Bernal's avatar Marvin Bernal Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I4a3fbe827e227cf70f5b8f7d537f695ab45b53f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 74ed70bb 7111e1f2

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

+3 −2
Original line number Diff line number Diff line
@@ -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,

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

+3 −3
Original line number Diff line number Diff line
@@ -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(