summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/keyguard
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-04-02 12:39:51 +0200
committerJorim Jaggi <jjaggi@google.com>2014-04-05 16:50:36 +0200
commit03c701ec58ff6de3cc3c53b05342a475a63a11cf (patch)
tree9ef98a02620968d1cb69a44db8cfc0f1ce12790e /packages/SystemUI/src/com/android/systemui/keyguard
parent2f24dc436e1c55cd7694ccf4f20ecba6896090ba (diff)
downloadframeworks_base-03c701ec58ff6de3cc3c53b05342a475a63a11cf.zip
frameworks_base-03c701ec58ff6de3cc3c53b05342a475a63a11cf.tar.gz
frameworks_base-03c701ec58ff6de3cc3c53b05342a475a63a11cf.tar.bz2
Basic implementation for notifications on lockscreen.
This change makes PhoneStatusBar expand while the lockscreen is showing. Further, the KeyguardSimpleHostView is shown by KeyguardBouncer, and the Bouncer is shown whenever the user tries to unlock the phone (closing the shade). Bug: 13635952 Change-Id: I4354b7a7937af6e1c93abf16ad6e485376d16bc2
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 3326dee..bb39d36 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -1224,10 +1224,6 @@ public class KeyguardViewMediator extends SystemUI {
updateActivityLockScreenState();
adjustStatusBarLocked();
userActivity();
- try {
- ActivityManagerNative.getDefault().closeSystemDialogs("lock");
- } catch (RemoteException e) {
- }
// Do this at the end to not slow down display of the keyguard.
playSounds(true);
@@ -1360,9 +1356,14 @@ public class KeyguardViewMediator extends SystemUI {
mUpdateMonitor.dispatchBootCompleted();
}
- public void registerStatusBar(PhoneStatusBar phoneStatusBar, ViewGroup container,
- StatusBarWindowManager statusBarWindowManager) {
+ public StatusBarKeyguardViewManager registerStatusBar(PhoneStatusBar phoneStatusBar,
+ ViewGroup container, StatusBarWindowManager statusBarWindowManager) {
mStatusBarKeyguardViewManager.registerStatusBar(phoneStatusBar, container,
statusBarWindowManager);
+ return mStatusBarKeyguardViewManager;
+ }
+
+ public ViewMediatorCallback getViewMediatorCallback() {
+ return mViewMediatorCallback;
}
}