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

Commit 34847016 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Bring width of controls panel up to spec" into tm-qpr-dev

parents f3ef9103 d2f43a85
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:orientation="horizontal"
      android:layout_marginTop="@dimen/controls_top_margin"
      android:layout_marginBottom="@dimen/controls_header_bottom_margin">

    <!-- make sure the header stays centered in the layout by adding a spacer -->
@@ -78,6 +77,7 @@
        android:layout_weight="1"
        android:orientation="vertical"
        android:clipChildren="true"
        android:paddingHorizontal="16dp"
        android:scrollbars="none">
    <include layout="@layout/global_actions_controls_list_view" />

@@ -88,8 +88,6 @@
      android:layout_width="match_parent"
      android:layout_height="0dp"
      android:layout_weight="1"
      android:layout_marginLeft="@dimen/global_actions_side_margin"
      android:layout_marginRight="@dimen/global_actions_side_margin"
      android:background="@drawable/controls_panel_background"
      android:visibility="gone"
      />
+2 −0
Original line number Diff line number Diff line
@@ -64,4 +64,6 @@

    <dimen name="qs_panel_padding_top">@dimen/qqs_layout_margin_top</dimen>
    <dimen name="qs_panel_padding_top_combined_headers">@dimen/qs_panel_padding_top</dimen>

    <dimen name="controls_padding_horizontal">16dp</dimen>
</resources>
+0 −3
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@
    <!-- Text size for user name in user switcher -->
    <dimen name="kg_user_switcher_text_size">18sp</dimen>

    <dimen name="controls_header_bottom_margin">12dp</dimen>
    <dimen name="controls_top_margin">24dp</dimen>

    <dimen name="global_actions_grid_item_layout_height">80dp</dimen>

    <dimen name="qs_brightness_margin_bottom">16dp</dimen>
+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
*/
-->
<resources>
    <dimen name="controls_padding_horizontal">205dp</dimen>
    <dimen name="split_shade_notifications_scrim_margin_bottom">24dp</dimen>
    <dimen name="notification_panel_margin_bottom">64dp</dimen>

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
    <!-- gap on either side of status bar notification icons -->
    <dimen name="status_bar_icon_padding">1dp</dimen>

    <dimen name="controls_padding_horizontal">75dp</dimen>
    <dimen name="controls_padding_horizontal">40dp</dimen>

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

Loading