From 6bd3890ff965c443b27d7e9224a34ba1312344ab Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Tue, 6 Sep 2016 15:27:56 -0700 Subject: [PATCH] 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 --- .../Keyguard/src/com/android/keyguard/KeyguardPINView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java index 779289429e2f5..285b1aeb7bebc 100644 --- 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