summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Aaron Liu <aaronjli@google.com> 2023-03-03 09:02:02 -0800
committer Aaron Liu <aaronjli@google.com> 2023-03-03 10:19:44 -0800
commitd5598e92d5fb7e276081b52fa3451d9e95f05de7 (patch)
tree53e356b6ac817daa0bf6bc7abce8e7ebb5064d33
parentf885dad18ee08dda305b36f31644da3c6c5f6789 (diff)
Bouncer pin appear flashes the message area
cleaning up this transition a bit where the message will briefly show if you are tracking your finger slightly from LS. Test: Track bouncer to show apper animation. Fixes: 271576016 Change-Id: Ic8bd2d0e015ca407ab2a08cd6e0646c1c277f88e
-rw-r--r--packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
index 67e3400670ba..03947542d21e 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
@@ -217,9 +217,11 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
private void animate(float progress) {
Interpolator standardDecelerate = Interpolators.STANDARD_DECELERATE;
Interpolator legacyDecelerate = Interpolators.LEGACY_DECELERATE;
+ float standardProgress = standardDecelerate.getInterpolation(progress);
mBouncerMessageView.setTranslationY(
- mYTrans - mYTrans * standardDecelerate.getInterpolation(progress));
+ mYTrans - mYTrans * standardProgress);
+ mBouncerMessageView.setAlpha(standardProgress);
for (int i = 0; i < mViews.length; i++) {
View[] row = mViews[i];
@@ -236,7 +238,7 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
view.setAlpha(scaledProgress);
int yDistance = mYTrans + mYTransOffset * i;
view.setTranslationY(
- yDistance - (yDistance * standardDecelerate.getInterpolation(progress)));
+ yDistance - (yDistance * standardProgress));
if (view instanceof NumPadAnimationListener) {
((NumPadAnimationListener) view).setProgress(scaledProgress);
}