diff options
6 files changed, 5 insertions, 9 deletions
diff --git a/packages/SystemUI/res/layout/controls_with_favorites.xml b/packages/SystemUI/res/layout/controls_with_favorites.xml index ded6f9386503..aa211bf8cfdc 100644 --- a/packages/SystemUI/res/layout/controls_with_favorites.xml +++ b/packages/SystemUI/res/layout/controls_with_favorites.xml @@ -20,7 +20,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:layout_marginTop="@dimen/controls_top_margin" android:layout_marginBottom="@dimen/controls_header_bottom_margin"> <!-- make sure the header stays centered in the layout by adding a spacer --> @@ -78,6 +77,7 @@ android:layout_weight="1" android:orientation="vertical" android:clipChildren="true" + android:paddingHorizontal="16dp" android:scrollbars="none"> <include layout="@layout/global_actions_controls_list_view" /> @@ -88,8 +88,6 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:layout_marginLeft="@dimen/global_actions_side_margin" - android:layout_marginRight="@dimen/global_actions_side_margin" android:background="@drawable/controls_panel_background" android:visibility="gone" /> diff --git a/packages/SystemUI/res/values-land/dimens.xml b/packages/SystemUI/res/values-land/dimens.xml index fff25448b2e4..ac81dccecc0a 100644 --- a/packages/SystemUI/res/values-land/dimens.xml +++ b/packages/SystemUI/res/values-land/dimens.xml @@ -64,4 +64,6 @@ <dimen name="qs_panel_padding_top">@dimen/qqs_layout_margin_top</dimen> <dimen name="qs_panel_padding_top_combined_headers">@dimen/qs_panel_padding_top</dimen> + + <dimen name="controls_padding_horizontal">16dp</dimen> </resources> diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index db7fb48a4ac4..4f24d831a3ee 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -51,9 +51,6 @@ <!-- Text size for user name in user switcher --> <dimen name="kg_user_switcher_text_size">18sp</dimen> - <dimen name="controls_header_bottom_margin">12dp</dimen> - <dimen name="controls_top_margin">24dp</dimen> - <dimen name="global_actions_grid_item_layout_height">80dp</dimen> <dimen name="qs_brightness_margin_bottom">16dp</dimen> diff --git a/packages/SystemUI/res/values-sw720dp-land/dimens.xml b/packages/SystemUI/res/values-sw720dp-land/dimens.xml index 122806a1af8f..2b88e55bbcbf 100644 --- a/packages/SystemUI/res/values-sw720dp-land/dimens.xml +++ b/packages/SystemUI/res/values-sw720dp-land/dimens.xml @@ -17,7 +17,6 @@ */ --> <resources> - <dimen name="controls_padding_horizontal">205dp</dimen> <dimen name="split_shade_notifications_scrim_margin_bottom">24dp</dimen> <dimen name="notification_panel_margin_bottom">64dp</dimen> diff --git a/packages/SystemUI/res/values-sw720dp/dimens.xml b/packages/SystemUI/res/values-sw720dp/dimens.xml index 927059aa7e40..8f59df655c3a 100644 --- a/packages/SystemUI/res/values-sw720dp/dimens.xml +++ b/packages/SystemUI/res/values-sw720dp/dimens.xml @@ -19,7 +19,7 @@ <!-- gap on either side of status bar notification icons --> <dimen name="status_bar_icon_padding">1dp</dimen> - <dimen name="controls_padding_horizontal">75dp</dimen> + <dimen name="controls_padding_horizontal">40dp</dimen> <dimen name="large_screen_shade_header_height">56dp</dimen> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 2b0021b26f19..74965a557e01 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1115,7 +1115,7 @@ <!-- Home Controls --> <dimen name="controls_header_menu_size">48dp</dimen> - <dimen name="controls_header_bottom_margin">24dp</dimen> + <dimen name="controls_header_bottom_margin">16dp</dimen> <dimen name="controls_header_app_icon_size">24dp</dimen> <dimen name="controls_top_margin">48dp</dimen> <dimen name="controls_padding_horizontal">0dp</dimen> |