Merge "Fix slow PIN dismiss animation" into nyc-mr1-dev

2016-09-07 21:16:22 +00:00
parent f3c21a8950 6bd3890ff9
commit bcf32170b3
1 changed files with 2 additions and 2 deletions
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
@@ -142,8 +142,8 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
                mDisappearYTranslation, mDisappearAnimationUtils.getInterpolator());
        DisappearAnimationUtils disappearAnimationUtils = mKeyguardUpdateMonitor
                .needsSlowUnlockTransition()
-                        ? mDisappearAnimationUtils
-                        : mDisappearAnimationUtilsLocked;
+                        ? mDisappearAnimationUtilsLocked
+                        : mDisappearAnimationUtils;
        disappearAnimationUtils.startAnimation2d(mViews,
                new Runnable() {
                    @Override