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

Commit fd73c15e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use different top margin for the QS detail panel in split shade" into sc-v2-dev

parents 25025619 50018ac7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/qs_detail_background"
    android:layout_marginTop="@dimen/qs_detail_margin_top"
    android:clickable="true"
    android:orientation="vertical"
    android:layout_marginTop="@*android:dimen/quick_qs_offset_height"
    android:paddingBottom="8dp"
    android:visibility="invisible"
    android:elevation="4dp"
+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@

    <com.android.systemui.ResizingSpace
        android:layout_width="match_parent"
        android:layout_height="@dimen/qs_detail_margin_top" />
        android:layout_height="@dimen/qs_detail_header_margin_top" />

    <LinearLayout
        android:layout_width="match_parent"
+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@
    <dimen name="battery_detail_graph_space_top">9dp</dimen>
    <dimen name="battery_detail_graph_space_bottom">9dp</dimen>

    <dimen name="qs_detail_margin_top">14dp</dimen>
    <dimen name="qs_detail_header_margin_top">14dp</dimen>

    <dimen name="volume_tool_tip_top_margin">12dp</dimen>
    <dimen name="volume_row_slider_height">128dp</dimen>
+3 −0
Original line number Diff line number Diff line
@@ -100,4 +100,7 @@
    same as phones in portrait  -->
    <dimen name="qs_security_footer_single_line_height">48dp</dimen>
    <dimen name="qs_security_footer_background_inset">0dp</dimen>

    <!-- When split shade is used, this panel should be aligned to the top -->
    <dimen name="qs_detail_margin_top">0dp</dimen>
</resources>
+3 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@
    <dimen name="qs_detail_item_primary_text_size">16sp</dimen>
    <dimen name="qs_detail_item_secondary_text_size">14sp</dimen>
    <dimen name="qs_detail_empty_text_size">14sp</dimen>
    <dimen name="qs_detail_margin_top">28dp</dimen>
    <dimen name="qs_detail_header_margin_top">28dp</dimen>
    <dimen name="qs_detail_back_margin_end">16dp</dimen>
    <dimen name="qs_detail_header_text_padding">16dp</dimen>
    <dimen name="qs_data_usage_text_size">14sp</dimen>
@@ -659,6 +659,8 @@
    <!-- Padding between subtitles and the following text in the QSFooter dialog -->
    <dimen name="qs_footer_dialog_subtitle_padding">20dp</dimen>

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

    <dimen name="seek_bar_height">3dp</dimen>
    <dimen name="seek_bar_corner_radius">3dp</dimen>