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

Commit bc100d61 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix margins between headers and tiles." into sc-dev am: d7881573 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14606170

Change-Id: Id654792d50a6ed1fb179df8282d61c988a36c16c
parents b3091fa1 d7881573

packages/SystemUI/res/layout/qs_paged_page.xml

+1 −3
Original line number Diff line number Diff line
@@ -18,6 +18,4 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/tile_page"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

    android:clipToPadding="false" />
 
    android:layout_height="match_parent"/>

packages/SystemUI/res/layout/qs_paged_tile_layout.xml

+1 −4
Original line number Diff line number Diff line
@@ -20,7 +20,4 @@ 
    android:id="@+id/qs_pager"

    android:layout_width="match_parent"

    android:layout_height="0dp"

    android:layout_weight="1"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingBottom="@dimen/qs_paged_tile_layout_padding_bottom" />
 
    android:layout_weight="1"/>

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_below="@id/quick_qs_status_icons"

        android:layout_marginTop="8dp"

        android:layout_marginTop="@dimen/qqs_layout_margin_top"

        android:accessibilityTraversalAfter="@id/quick_qs_status_icons"

        android:clipChildren="false"

        android:clipToPadding="false"

packages/SystemUI/res/values-land/dimens.xml

+6 −4
Original line number Diff line number Diff line
@@ -22,13 +22,15 @@ 
    <dimen name="docked_divider_handle_width">2dp</dimen>

    <dimen name="docked_divider_handle_height">16dp</dimen>



    <dimen name="qs_tile_margin_top">8dp</dimen>



    <dimen name="qs_tile_height">84dp</dimen>

    <dimen name="qs_brightness_margin_top">0dp</dimen>

    <dimen name="qs_brightness_margin_bottom">12dp</dimen>

    <dimen name="qqs_layout_margin_top">8dp</dimen>

    <!-- The height of the qs customize header. Should be

    (qs_panel_padding_top (48dp) +  brightness_mirror_height (48dp) + qs_tile_margin_top (8dp)) -

    (qs_panel_padding_top (48dp) +  brightness_mirror_height (48dp) + qs_brightness_margin_top (0dp) + qs_brightness_margin_bottom (12dp)) -

    (Toolbar_minWidth (56dp) + qs_tile_margin_top_bottom (4dp))

    -->

    <dimen name="qs_customize_header_min_height">44dp</dimen>

    <dimen name="qs_customize_header_min_height">48dp</dimen>



    <dimen name="qs_security_footer_single_line_height">@*android:dimen/quick_qs_offset_height</dimen>

    <dimen name="qs_footer_padding">14dp</dimen>

packages/SystemUI/res/values/dimens.xml

+6 −8
Original line number Diff line number Diff line
@@ -536,21 +536,22 @@ 
    <dimen name="pull_span_min">25dp</dimen>



    <dimen name="qs_corner_radius">28dp</dimen>

    <dimen name="qs_tile_height">88dp</dimen>

    <dimen name="qs_tile_height">84dp</dimen>

    <!--notification_side_paddings + notification_content_margin_start - (qs_quick_tile_size - qs_tile_background_size) / 2 -->

    <dimen name="qs_tile_layout_margin_side">18dp</dimen>

    <dimen name="qs_tile_margin_horizontal">8dp</dimen>

    <dimen name="qs_tile_margin_horizontal_two_line">2dp</dimen>

    <dimen name="qs_tile_margin_vertical">@dimen/qs_tile_margin_horizontal</dimen>

    <dimen name="qs_tile_margin_top_bottom">4dp</dimen>

    <dimen name="qs_tile_margin_top_bottom_negative">-4dp</dimen>

    <dimen name="qs_brightness_margin_top">8dp</dimen>

    <dimen name="qs_brightness_margin_bottom">24dp</dimen>

    <dimen name="qqs_layout_margin_top">16dp</dimen>

    <!-- The height of the qs customize header. Should be

         (qs_panel_padding_top (48dp) +  brightness_mirror_height (48dp) + qs_tile_margin_top (18dp)) -

         (qs_panel_padding_top (48dp) +  brightness_mirror_height (48dp) + qs_brightness_margin_top(8dp) + qs_brightness_margin_bottom (24dp)) -

         (Toolbar_minWidth (56dp) + qs_tile_margin_top_bottom (4dp))

    -->

    <dimen name="qs_customize_header_min_height">54dp</dimen>

    <dimen name="qs_customize_header_min_height">68dp</dimen>

    <dimen name="qs_customize_internal_side_paddings">8dp</dimen>

    <dimen name="qs_tile_margin_top">18dp</dimen>

    <dimen name="qs_tile_icon_background_stroke_width">-1dp</dimen>

    <dimen name="qs_tile_background_size">56dp</dimen>

    <dimen name="qs_icon_size">20dp</dimen>
@@ -610,7 +611,6 @@ 
    <dimen name="qs_status_separator">32dp</dimen>

    <dimen name="qs_carrier_margin_width">4dp</dimen>

    <dimen name="qs_footer_icon_size">20dp</dimen>

    <dimen name="qs_paged_tile_layout_padding_bottom">0dp</dimen>

    <dimen name="qs_header_top_padding">15dp</dimen>

    <dimen name="qs_header_bottom_padding">14dp</dimen>
@@ -1251,8 +1251,6 @@ 
    <!-- Size of the RAT type for CellularTile -->

    <dimen name="celltile_rat_type_size">10sp</dimen>



    <dimen name="new_qs_vertical_margin">8dp</dimen>



    <!-- Size of media cards in the QSPanel carousel -->

    <dimen name="qs_media_padding">16dp</dimen>

    <dimen name="qs_media_album_size_small">72dp</dimen>