Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4c3133a2: am cb326240: Merge "Correctly handle launch animations for affordances" into lmp-mr1-dev

Browse Source 
* commit '4c3133a2d1142ca5bf5d6165d32621cc22b34392':
  Correctly handle launch animations for affordances
This commit is contained in:
Jorim Jaggi
2014-11-12 15:55:50 +00:00
committed by Android Git Automerger
parent 2240f80634 4c3133a2d1
commit 46f38ac35d
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3123,18 +3123,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
protected void dismissKeyguardThenExecute(final OnDismissAction action, protected void dismissKeyguardThenExecute(final OnDismissAction action,
boolean afterKeyguardGone) { boolean afterKeyguardGone) {
if (mStatusBarKeyguardViewManager.isShowing()) { 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 { } else {
action.onDismiss(); action.onDismiss();
} }