diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-11 19:16:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-11 19:16:10 +0000 |
| commit | e20bb0015e4efa6b2485c1df62153e1814bf9a7b (patch) | |
| tree | 9324632f5453272b39900df9c31972da8e00945d /packages/SystemUI/res | |
| parent | 5114a686653f09cd80974b9a851499599a264f6d (diff) | |
| parent | 3850805513c51616f42ed5c638f09e93670c4cea (diff) | |
| download | frameworks_base-e20bb0015e4efa6b2485c1df62153e1814bf9a7b.zip frameworks_base-e20bb0015e4efa6b2485c1df62153e1814bf9a7b.tar.gz frameworks_base-e20bb0015e4efa6b2485c1df62153e1814bf9a7b.tar.bz2 | |
am e302d4dc: Merge "Make notification panel fullscreen on tablets."
* commit 'e302d4dc3d61f4aefdf8e5f32c2887b87089582e':
Make notification panel fullscreen on tablets.
Diffstat (limited to 'packages/SystemUI/res')
5 files changed, 18 insertions, 17 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 56c0e10..f045da4 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -50,9 +50,8 @@ /> <com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer + style="@style/NotificationsQuickSettings" android:id="@+id/notification_container_parent" - android:layout_width="match_parent" - android:layout_height="match_parent" android:clipToPadding="false" android:clipChildren="false"> @@ -89,13 +88,7 @@ </com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer> - - <include layout="@layout/status_bar_expanded_header" - android:layout_width="match_parent" - android:layout_height="@dimen/status_bar_header_height" - android:layout_marginLeft="@dimen/notification_side_padding" - android:layout_marginRight="@dimen/notification_side_padding" - /> + <include layout="@layout/status_bar_expanded_header" /> <include layout="@layout/keyguard_bottom_area" diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index c9da221..88abe36 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -20,10 +20,10 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" android:id="@+id/header" - android:layout_width="match_parent" + style="@style/StatusBarHeader" android:layout_height="@dimen/status_bar_header_height" - android:orientation="horizontal" - android:gravity="center_vertical" + android:paddingStart="@dimen/notification_side_padding" + android:paddingEnd="@dimen/notification_side_padding" android:baselineAligned="false" android:elevation="10dp" > diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml index f7cd37c..26616cd 100644 --- a/packages/SystemUI/res/layout/super_status_bar.xml +++ b/packages/SystemUI/res/layout/super_status_bar.xml @@ -35,7 +35,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" > <include layout="@layout/status_bar_expanded" - style="@style/StatusBarExpanded" + android:layout_width="match_parent" + android:layout_height="match_parent" android:visibility="gone" /> </com.android.systemui.statusbar.phone.PanelHolder> diff --git a/packages/SystemUI/res/values-sw600dp/styles.xml b/packages/SystemUI/res/values-sw600dp/styles.xml index 1ea9442..d4a9986 100644 --- a/packages/SystemUI/res/values-sw600dp/styles.xml +++ b/packages/SystemUI/res/values-sw600dp/styles.xml @@ -19,9 +19,14 @@ <item name="android:layout_width">480dp</item> </style> - <style name="StatusBarExpanded"> + <style name="NotificationsQuickSettings"> <item name="android:layout_width">@dimen/notification_panel_width</item> <item name="android:layout_height">match_parent</item> - <item name="android:layout_gravity">start|top</item> + <item name="android:layout_gravity">top|center_horizontal</item> + </style> + + <style name="StatusBarHeader"> + <item name="android:layout_width">@dimen/notification_panel_width</item> + <item name="android:layout_gravity">center_horizontal</item> </style> </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 6608c5d..1ad1e3e 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -171,10 +171,12 @@ <style name="systemui_theme" parent="@android:style/Theme.DeviceDefault" /> - <style name="StatusBarExpanded"> + <style name="NotificationsQuickSettings"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> - <item name="android:layout_gravity">start|top</item> </style> + <style name="StatusBarHeader"> + <item name="android:layout_width">match_parent</item> + </style> </resources> |