diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-03-26 18:31:48 +0100 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-03-31 20:58:31 +0200 |
| commit | 5cf17879a31b7b78c09ec50b727f921840dcf783 (patch) | |
| tree | 0e3d1a52b1c275676c80c6f90dd516a4d8e292cb /packages/SystemUI/res/layout-sw600dp | |
| parent | 085226c40f21a4467f047b901c7640e2215828d8 (diff) | |
| download | frameworks_base-5cf17879a31b7b78c09ec50b727f921840dcf783.zip frameworks_base-5cf17879a31b7b78c09ec50b727f921840dcf783.tar.gz frameworks_base-5cf17879a31b7b78c09ec50b727f921840dcf783.tar.bz2 | |
Reuse KeyguardViewMediator for new Keyguard implementation.
This change reuses KeyguardViewMediator for the new Keyguard
implementation in status bar. KeyguardViewManager is replaced by
StatusBarKeyguardManager which handles adding the view, setting the
state etc. StatusBarWindowManager is introduced to managed the window
of the status bar, which has the logic of both the old Keyguard window
and the old status bar window. In the current implementation, Keyguard
gets displayed like it would be in the bouncer state, but that's likely
to change in the future. Also, setHidden in IKeyguardService is also
renamed to setOccluded, as the word hidden interferes with the
terminology when dismissing the Keyguard.
Bug: 13635952
Change-Id: I1c5d5a49d810d8532089f464cb2efe35e577f517
Diffstat (limited to 'packages/SystemUI/res/layout-sw600dp')
| -rw-r--r-- | packages/SystemUI/res/layout-sw600dp/super_status_bar.xml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml b/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml index 49314cd..0916d15 100644 --- a/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml +++ b/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml @@ -21,9 +21,10 @@ <com.android.systemui.statusbar.phone.StatusBarWindowView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" + android:layout_width="match_parent" + android:layout_height="match_parent" android:focusable="true" android:descendantFocusability="afterDescendants" - android:fitsSystemWindows="true" > <include layout="@layout/status_bar" @@ -36,6 +37,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="@*android:dimen/status_bar_height" + android:layout_marginBottom="@*android:dimen/navigation_bar_height" > <include layout="@layout/status_bar_expanded" android:layout_width="@dimen/notification_panel_width" @@ -49,9 +51,4 @@ /> </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> |