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

Commit 31ea6210 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Adjust QS side spacing in split shade according to specs" into tm-dev...

Merge "Adjust QS side spacing in split shade according to specs" into tm-dev am: eb08799a am: 99613b91

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



Change-Id: Ia457686a54341ad3aecda269eacdde02ec4e3f44
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 107f96c0 99613b91
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -22,6 +22,4 @@
    <!-- Overload default clock widget parameters -->
    <dimen name="widget_big_font_size">88dp</dimen>

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

</resources>
+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
    android:id="@+id/tile_page"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:paddingStart="@dimen/notification_side_paddings"
    android:paddingEnd="@dimen/notification_side_paddings"
    android:paddingStart="@dimen/qs_tiles_page_horizontal_margin"
    android:paddingEnd="@dimen/qs_tiles_page_horizontal_margin"
    android:clipChildren="false"
    android:clipToPadding="false" />
+10 −3
Original line number Diff line number Diff line
@@ -21,13 +21,20 @@
    <dimen name="keyguard_indication_margin_bottom">25dp</dimen>
    <dimen name="ambient_indication_margin_bottom">115dp</dimen>
    <dimen name="lock_icon_margin_bottom">60dp</dimen>

    <dimen name="qs_media_session_height_expanded">172dp</dimen>

    <!-- margin from keyguard status bar to clock. For split shade it should be
         keyguard_split_shade_top_margin - status_bar_header_height_keyguard = 8dp -->
    <dimen name="keyguard_clock_top_margin">8dp</dimen>

    <!-- QS-->
    <dimen name="qs_panel_padding_top">16dp</dimen>
    <dimen name="qs_content_horizontal_padding">24dp</dimen>
    <dimen name="qs_horizontal_margin">24dp</dimen>
    <!-- in split shade qs_tiles_page_horizontal_margin should be equal of qs_horizontal_margin/2,
         otherwise full space between two pages is qs_horizontal_margin*2, and that makes tiles page
         not appear immediately after user swipes to the side -->
    <dimen name="qs_tiles_page_horizontal_margin">12dp</dimen>
    <dimen name="qs_media_session_height_expanded">172dp</dimen>

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

    <dimen name="notification_panel_margin_bottom">48dp</dimen>
+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,12 @@
    <dimen name="status_bar_header_height_keyguard">56dp</dimen>

    <dimen name="qs_media_session_height_expanded">251dp</dimen>
    <dimen name="qs_content_horizontal_padding">40dp</dimen>
    <dimen name="qs_horizontal_margin">40dp</dimen>
    <!-- in split shade qs_tiles_page_horizontal_margin should be equal of qs_horizontal_margin/2,
         otherwise full space between two pages is qs_horizontal_margin*2, and that makes tiles page
         not appear immediately after user swipes to the side -->
    <dimen name="qs_tiles_page_horizontal_margin">20dp</dimen>

    <dimen name="lockscreen_shade_max_over_scroll_amount">42dp</dimen>

+16 −0
Original line number Diff line number Diff line
@@ -478,6 +478,22 @@
    <dimen name="qqs_layout_margin_top">16dp</dimen>
    <dimen name="qqs_layout_padding_bottom">24dp</dimen>

    <!-- Most of the time it should be the same as notification_side_paddings as it's vertically
         aligned with notifications. The exception is split shade when this value becomes
         independent  -->
    <dimen name="qs_horizontal_margin">@dimen/notification_side_paddings</dimen>

    <!-- Most of the time it should be the same as notification_shade_content_margin_horizontal as
         it's vertically aligned with notifications. The exception is split shade when this value
         becomes independent  -->
    <dimen name="qs_content_horizontal_padding">@dimen/notification_shade_content_margin_horizontal</dimen>

    <!-- Most of the time it should be the same as notification_side_paddings as it's vertically
        aligned with notifications. That's not the case on large screen when we have either split
        shade and QS is not above notifications or in portrait shade when notification scrim is no
        longer full width and next page of tiles should be at the edge of the screen -->
    <dimen name="qs_tiles_page_horizontal_margin">@dimen/notification_side_paddings</dimen>

    <dimen name="qs_customize_internal_side_paddings">8dp</dimen>
    <dimen name="qs_icon_size">20dp</dimen>
    <dimen name="qs_side_view_size">28dp</dimen>
Loading