diff options
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar.xml | 25 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded_header.xml | 6 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/super_status_bar.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 2 |
4 files changed, 20 insertions, 16 deletions
diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index 1b35537..585658e 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -77,26 +77,24 @@ <LinearLayout android:id="@+id/system_icon_area" android:layout_width="wrap_content" android:layout_height="match_parent" - android:orientation="horizontal"> - - <LinearLayout android:id="@+id/statusIcons" + android:orientation="horizontal" + > + <LinearLayout android:id="@+id/system_icons" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical" - android:orientation="horizontal"/> - - <LinearLayout - android:id="@+id/signal_battery_cluster" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:paddingStart="2dp" - android:orientation="horizontal" - android:gravity="center" > - <include layout="@layout/signal_cluster_view" + <LinearLayout android:id="@+id/statusIcons" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:orientation="horizontal"/> + + <include layout="@layout/signal_cluster_view" android:id="@+id/signal_cluster" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="2dp" /> <!-- battery must be padded below to match assets --> <com.android.systemui.BatteryMeterView @@ -107,7 +105,6 @@ android:layout_marginStart="4dip" /> </LinearLayout> - <com.android.systemui.statusbar.policy.Clock android:id="@+id/clock" android:textAppearance="@style/TextAppearance.StatusBar.Clock" diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index adfa1e4..3759f82 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -65,6 +65,12 @@ /> </RelativeLayout> + <FrameLayout android:id="@+id/system_icons_container" + android:layout_width="wrap_content" + android:layout_height="@dimen/status_bar_header_height" + android:layout_alignParentEnd="true" + android:layout_marginEnd="16dp" + /> <TextView android:id="@+id/header_debug_info" android:visibility="invisible" diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml index f9b022c..e95f3c3 100644 --- a/packages/SystemUI/res/layout/super_status_bar.xml +++ b/packages/SystemUI/res/layout/super_status_bar.xml @@ -37,7 +37,8 @@ <include layout="@layout/status_bar_expanded" android:layout_width="@dimen/notification_panel_width" android:layout_height="match_parent" - android:layout_gravity="start|top" /> + android:layout_gravity="start|top" + android:visibility="gone" /> </com.android.systemui.statusbar.phone.PanelHolder> </com.android.systemui.statusbar.phone.StatusBarWindowView> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index c6fdc16..50df706 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -153,7 +153,7 @@ <dimen name="close_handle_underlap">32dp</dimen> <!-- Height of the status bar header bar --> - <dimen name="status_bar_header_height">48dp</dimen> + <dimen name="status_bar_header_height">56dp</dimen> <!-- Height of the status bar header bar when expanded --> <dimen name="status_bar_header_height_expanded">144dp</dimen> |