diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-11-12 15:51:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 15:51:51 +0000 |
| commit | 4c3133a2d1142ca5bf5d6165d32621cc22b34392 (patch) | |
| tree | 09c5b3cba6ffbe967511726a33dac6c3d3c90d32 /packages | |
| parent | d04f864cae1ae553398774692effb663b73f902c (diff) | |
| parent | cb3262403420417f355aacde93e0e43493e510f6 (diff) | |
| download | frameworks_base-4c3133a2d1142ca5bf5d6165d32621cc22b34392.zip frameworks_base-4c3133a2d1142ca5bf5d6165d32621cc22b34392.tar.gz frameworks_base-4c3133a2d1142ca5bf5d6165d32621cc22b34392.tar.bz2 | |
am cb326240: Merge "Correctly handle launch animations for affordances" into lmp-mr1-dev
* commit 'cb3262403420417f355aacde93e0e43493e510f6':
Correctly handle launch animations for affordances
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 1697646..881b38e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -3123,18 +3123,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, protected void dismissKeyguardThenExecute(final OnDismissAction action, boolean afterKeyguardGone) { if (mStatusBarKeyguardViewManager.isShowing()) { - if (UnlockMethodCache.getInstance(mContext).isMethodInsecure() - && mNotificationPanel.isLaunchTransitionRunning() && !afterKeyguardGone) { - action.onDismiss(); - mNotificationPanel.setLaunchTransitionEndRunnable(new Runnable() { - @Override - public void run() { - mStatusBarKeyguardViewManager.dismiss(); - } - }); - } else { - mStatusBarKeyguardViewManager.dismissWithAction(action, afterKeyguardGone); - } + mStatusBarKeyguardViewManager.dismissWithAction(action, afterKeyguardGone); } else { action.onDismiss(); } |