Merge "Correctly handle launch animations for affordances" into lmp-mr1-dev (cb326240) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+1 −12

Original line number	Diff line number	Diff line
		@@ -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);
		}
		} else {
		action.onDismiss();
		}