diff options
| author | John Spurlock <jspurlock@google.com> | 2014-05-21 21:29:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 21:29:23 +0000 |
| commit | b4e69a040d56989ae1f46dc92e15a37405a0c0d9 (patch) | |
| tree | 4d843a88b13f6731ba682352f3b520ee7bf80c8b /policy | |
| parent | 35453dd751e5d7041b27045943d60ca0e1b51e20 (diff) | |
| parent | 8fdfe624aa5ed68eaac060f82bc400f878bff95e (diff) | |
| download | frameworks_base-b4e69a040d56989ae1f46dc92e15a37405a0c0d9.zip frameworks_base-b4e69a040d56989ae1f46dc92e15a37405a0c0d9.tar.gz frameworks_base-b4e69a040d56989ae1f46dc92e15a37405a0c0d9.tar.bz2 | |
Merge "Hide the keyguard scrim when the status bar comes back."
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 99dd2f4..9977193 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1744,6 +1744,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } mStatusBar = win; mStatusBarController.setWindow(win); + mKeyguardDelegate.hideScrim(); break; case TYPE_NAVIGATION_BAR: mContext.enforceCallingOrSelfPermission( |