diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-03-14 17:25:20 +0100 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-03-28 22:35:03 +0100 |
| commit | 380ecb81db52a9d0197ca969951d07b91c20d2b9 (patch) | |
| tree | 753915d98f530e97095dc9f3c95dba67d3fadfb5 /packages/SystemUI/res/layout-sw600dp | |
| parent | ca4761661a41fc0750a2bc5e7c90481216e626c3 (diff) | |
| download | frameworks_base-380ecb81db52a9d0197ca969951d07b91c20d2b9.zip frameworks_base-380ecb81db52a9d0197ca969951d07b91c20d2b9.tar.gz frameworks_base-380ecb81db52a9d0197ca969951d07b91c20d2b9.tar.bz2 | |
Make Keyguard a library and make StatusBar the new Keyguard.
This change achieves a couple of things:
- Let Keyguard be a library, so we can use it in SystemUI.
- Introduce FLAG_KEYGUARD for windows and deprecate TYPE_KEYGUARD. Make
all the TYPE_KEYGUARD behaviour dependant on the flag.
- Implement a new KeyguardService in SystemUI, and bind that service
from PhoneWindowManager.
- Introduce BaseStatusBar.setKeyguardState and inflate
KeyguardSimpleHostView there and use FLAG_KEYGUARD for the window, such
that the status bar window essentially gets the Keyguard.
Bug: 13635952
Change-Id: I059d80d8b9b9818a778ab685f4672ea2694def63
Diffstat (limited to 'packages/SystemUI/res/layout-sw600dp')
| -rw-r--r-- | packages/SystemUI/res/layout-sw600dp/super_status_bar.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml b/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml index 0947c6f..49314cd 100644 --- a/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml +++ b/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml @@ -31,7 +31,6 @@ android:layout_height="@*android:dimen/status_bar_height" /> - <com.android.systemui.statusbar.phone.PanelHolder android:id="@+id/panel_holder" android:layout_width="match_parent" @@ -49,4 +48,10 @@ android:layout_gravity="end|top" /> </com.android.systemui.statusbar.phone.PanelHolder> + + <FrameLayout android:id="@+id/keyguard" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone"> + </FrameLayout> </com.android.systemui.statusbar.phone.StatusBarWindowView> |