Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8618e09 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by android-build-merger
Browse files

Merge "Fixes QSCustomizer header height" into qt-dev 

am: 1bebf6a1

Change-Id: Iee07a1f770089c8a7f65d824d229570d77d8ddb4
parents f0eea2cf 1bebf6a1

packages/SystemUI/res/layout/qs_customize_header.xml

+0 −1
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/res/values/dimens.xml

+5 −2
Original line number Diff line number Diff line
@@ -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>