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

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

Browse Source
This commit is contained in:
Aaron Liu
2022-12-16 17:34:21 +00:00
committed by Android (Google) Code Review
parent 18964627b6 fc6b5a31a9
commit a867642f21
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
View File

@@ -177,8 +177,6 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
@Override @Override
public void startAppearAnimation() { public void startAppearAnimation() {
setAlpha(1f);
setTranslationY(0);
if (mAppearAnimator.isRunning()) { if (mAppearAnimator.isRunning()) {
mAppearAnimator.cancel(); mAppearAnimator.cancel();
} }
@@ -215,6 +213,7 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
/** Animate subviews according to expansion or time. */ /** Animate subviews according to expansion or time. */
private void animate(float progress) { private void animate(float progress) {
setAlpha(progress);
Interpolator standardDecelerate = Interpolators.STANDARD_DECELERATE; Interpolator standardDecelerate = Interpolators.STANDARD_DECELERATE;
Interpolator legacyDecelerate = Interpolators.LEGACY_DECELERATE; Interpolator legacyDecelerate = Interpolators.LEGACY_DECELERATE;

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

@@ -77,7 +77,6 @@ constructor(
/** Runnable to show the primary bouncer. */ /** Runnable to show the primary bouncer. */
val showRunnable = Runnable { val showRunnable = Runnable {
repository.setPrimaryVisible(true)
repository.setPrimaryShow( repository.setPrimaryShow(
KeyguardBouncerModel( KeyguardBouncerModel(
promptReason = repository.bouncerPromptReason ?: 0, promptReason = repository.bouncerPromptReason ?: 0,
@@ -86,6 +85,7 @@ constructor(
) )
) )
repository.setPrimaryShowingSoon(false) repository.setPrimaryShowingSoon(false)
repository.setPrimaryVisible(true)
primaryBouncerCallbackInteractor.dispatchVisibilityChanged(View.VISIBLE) primaryBouncerCallbackInteractor.dispatchVisibilityChanged(View.VISIBLE)
} }