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

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

Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev

parents 2f6eef69 c4a9b181
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@
    android:id="@+id/sliding_tabs"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_marginLeft="@dimen/dashboard_header_margin_left"
    android:layout_marginRight="@dimen/dashboard_header_margin_right"
    android:background="?android:attr/colorPrimary"/>
+1 −0
Original line number Diff line number Diff line
@@ -21,4 +21,5 @@
             android:id="@+id/main_content"
             android:layout_height="match_parent"
             android:layout_width="match_parent"
             android:background="@color/material_grey_300"
             />
+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
     limitations under the License.
-->

<Space
<View
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="@dimen/support_spacer_height"
+6 −2
Original line number Diff line number Diff line
@@ -18,8 +18,12 @@
    <dimen name="settings_side_margin">112dp</dimen>

    <!-- Dashboard padding in its container -->
    <dimen name="dashboard_padding_start">128dp</dimen>
    <dimen name="dashboard_padding_end">128dp</dimen>
    <dimen name="dashboard_padding_start">160dp</dimen>
    <dimen name="dashboard_padding_end">160dp</dimen>

    <!-- Dashboard Header margin in its container -->
    <dimen name="dashboard_header_margin_right">304dp</dimen>
    <dimen name="dashboard_header_margin_left">304dp</dimen>

    <!-- ActionBar contentInsetStart -->
    <dimen name="actionbar_contentInsetStart">128dp</dimen>
+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@
    <dimen name="dashboard_padding_start">80dp</dimen>
    <dimen name="dashboard_padding_end">80dp</dimen>

    <!-- Dashboard Header margin in its container -->
    <dimen name="dashboard_header_margin_right">176dp</dimen>
    <dimen name="dashboard_header_margin_left">176dp</dimen>

    <!-- Dashboard category padding start / end -->
    <dimen name="dashboard_category_padding_start">24dp</dimen>
    <dimen name="dashboard_category_padding_end">24dp</dimen>
Loading