Merge "[Bouncer] Refine entry animation scrimmed." into tm-qpr-dev am: a867642f21 am: 2110d89800

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

Change-Id: I3b94f1fb5ed02cb53c26a852ae6881d7a6d865e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -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

@@ -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)
     }