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

Commit a867642f authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge "[Bouncer] Refine entry animation scrimmed." into tm-qpr-dev

parents 18964627 fc6b5a31

packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java

+1 −2
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 


    @Override

    public void startAppearAnimation() {

        setAlpha(1f);

        setTranslationY(0);

        if (mAppearAnimator.isRunning()) {

            mAppearAnimator.cancel();

        }
@@ -215,6 +213,7 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 


    /** Animate subviews according to expansion or time. */

    private void animate(float progress) {

        setAlpha(progress);

        Interpolator standardDecelerate = Interpolators.STANDARD_DECELERATE;

        Interpolator legacyDecelerate = Interpolators.LEGACY_DECELERATE;

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ constructor( 


    /** Runnable to show the primary bouncer. */

    val showRunnable = Runnable {

        repository.setPrimaryVisible(true)

        repository.setPrimaryShow(

            KeyguardBouncerModel(

                promptReason = repository.bouncerPromptReason ?: 0,
@@ -86,6 +85,7 @@ constructor( 
            )

        )

        repository.setPrimaryShowingSoon(false)

        repository.setPrimaryVisible(true)

        primaryBouncerCallbackInteractor.dispatchVisibilityChanged(View.VISIBLE)

    }