commit 6bd3890ff965c443b27d7e9224a34ba1312344ab
author Jorim Jaggi <jjaggi@google.com> Tue Sep 06 15:27:56 2016 -0700
committer Jorim Jaggi <jjaggi@google.com> Tue Sep 06 15:27:56 2016 -0700
tree 6fc8284bc1ce85f29051ad2b241ab79b75246971
parent 735b9eca0f52fd27646ac7187bcebc56273bb771

Fix slow PIN dismiss animation

We need to do the slow dismissal when the user is locked, and not the
other way around.

Bug: 31203310
Change-Id: I6ad0fc831bd9dc26e7375916a0a091552f7790ae

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

diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
index 77928942..285b1ae 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
@@ -142,8 +142,8 @@
                 mDisappearYTranslation, mDisappearAnimationUtils.getInterpolator());
         DisappearAnimationUtils disappearAnimationUtils = mKeyguardUpdateMonitor
                 .needsSlowUnlockTransition()
-                        ? mDisappearAnimationUtils
-                        : mDisappearAnimationUtilsLocked;
+                        ? mDisappearAnimationUtilsLocked
+                        : mDisappearAnimationUtils;
         disappearAnimationUtils.startAnimation2d(mViews,
                 new Runnable() {
                     @Override