diff options
| author | 2019-05-20 13:36:46 +0000 | |
|---|---|---|
| committer | 2019-05-20 13:36:46 +0000 | |
| commit | 1bebf6a1a0b730cbe9c6c705825f31c21e8ff389 (patch) | |
| tree | 46e9fea6cd86ddf367a7d8d3ff21d68a74343664 | |
| parent | 0d7d8d2baf93e2409745625f3efd2d1bc2289d71 (diff) | |
| parent | 4999764bfba6a7b61d82812023b3e2fe24324d73 (diff) | |
Merge "Fixes QSCustomizer header height" into qt-dev
| -rw-r--r-- | packages/SystemUI/res/layout/qs_customize_header.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/SystemUI/res/layout/qs_customize_header.xml b/packages/SystemUI/res/layout/qs_customize_header.xml index 58066a3ef19c..481561d74138 100644 --- a/packages/SystemUI/res/layout/qs_customize_header.xml +++ b/packages/SystemUI/res/layout/qs_customize_header.xml @@ -20,7 +20,6 @@ android:id="@android:id/title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/qs_tile_margin_top_bottom_negative" android:gravity="center" android:minHeight="@dimen/qs_customize_header_min_height" android:textAppearance="@style/TextAppearance.QSEdit.Headers" diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index e00e5f23dea8..b49b6121a13f 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -442,8 +442,11 @@ <dimen name="qs_tile_margin_vertical">24dp</dimen> <dimen name="qs_tile_margin_top_bottom">12dp</dimen> <dimen name="qs_tile_margin_top_bottom_negative">-12dp</dimen> - <!-- The height of the qs customize header. Should be (28dp - qs_tile_margin_top_bottom). --> - <dimen name="qs_customize_header_min_height">40dp</dimen> + <!-- The height of the qs customize header. Should be + (qs_panel_padding_top (48dp) + brightness_mirror_height (48dp) + qs_tile_margin_top (18dp)) - + (Toolbar_minWidth (56dp) + qs_tile_margin_top_bottom (12dp)) + --> + <dimen name="qs_customize_header_min_height">46dp</dimen> <dimen name="qs_tile_margin_top">18dp</dimen> <dimen name="qs_tile_background_size">44dp</dimen> <dimen name="qs_quick_tile_size">48dp</dimen> |