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

Commit 208f861f authored by Wenbo Jie's avatar Wenbo Jie
Browse files

[DocsUI M3] Fix the vertical alignment 

App bar, Search chips row, Apps row, Work profile tabs row, Unit bar,
Files row and breadcrumb row should all be vertically aligned in all
screen sizes.

Checked the attached bug for screenshots.

Bug: 409697194
Test: m DocumentsUIGoogle && manual inspection
Flag: com.android.documentsui.flags.use_material3
Change-Id: I105e76d1f67012b8feccc1ee285f0b9ef78d8270
parent 42b12780

res/flag(com.android.documentsui.flags.use_material3)/layout-w900dp-h600dp/column_headers_m3.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
    android:layout_height="@dimen/doc_header_height_m3"

    android:baselineAligned="false"

    android:gravity="center_vertical"

    android:paddingStart="@dimen/table_header_padding_start"

    android:paddingEnd="@dimen/table_header_padding_end"

    android:paddingStart="@dimen/main_container_padding_start"

    android:paddingEnd="@dimen/main_container_padding_end"

    android:visibility="gone">



    <!-- Column headers -->

res/flag(com.android.documentsui.flags.use_material3)/layout/apps_row_m3.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
    android:background="@drawable/apps_row_background"

    android:layout_marginTop="@dimen/apps_row_margin_vertical"

    android:layout_marginBottom="@dimen/apps_row_margin_vertical"

    android:layout_marginStart="@dimen/apps_row_margin_horizontal"

    android:layout_marginEnd="@dimen/apps_row_margin_horizontal"

    android:layout_marginStart="@dimen/main_container_padding_start"

    android:layout_marginEnd="@dimen/main_container_padding_end"

    android:padding="@dimen/apps_row_padding"

    android:orientation="vertical">

res/flag(com.android.documentsui.flags.use_material3)/layout/column_headers_m3.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
    android:layout_height="@dimen/doc_header_height_m3"

    android:baselineAligned="false"

    android:gravity="center_vertical"

    android:paddingStart="@dimen/table_header_padding_start"

    android:paddingEnd="@dimen/table_header_padding_end"

    android:paddingStart="@dimen/main_container_padding_start"

    android:paddingEnd="@dimen/main_container_padding_end"

    android:background="?attr/colorSurfaceBright"

    android:visibility="gone">

res/flag(com.android.documentsui.flags.use_material3)/values-w600dp-h600dp/dimens_m3.xml

+2 −5
Original line number Diff line number Diff line
@@ -30,12 +30,9 @@ 
    <dimen name="grid_container_padding_right">@dimen/space_small_4</dimen>

    <dimen name="grid_container_padding_bottom">@dimen/space_extra_small_4</dimen>



    <dimen name="list_container_padding_m3">@dimen/space_extra_small_6</dimen>

    <dimen name="list_container_padding_m3">@dimen/space_small_1</dimen>



    <!-- list_container_padding + list_item_padding_start -->

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

    <!-- list_container_padding + list_item_padding_end -->

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

    <dimen name="breadcrumb_padding_horizontal">@dimen/space_small_3</dimen>



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

</resources>

res/flag(com.android.documentsui.flags.use_material3)/values-w900dp-h600dp/dimens_m3.xml

+1 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
    <dimen name="grid_padding_horiz_m3">16dp</dimen>

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



    <dimen name="list_container_padding_m3">@dimen/space_extra_small_6</dimen>

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

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

    <dimen name="list_item_padding_end">0dp</dimen>
@@ -37,9 +38,4 @@ 
    <dimen name="toolbar_padding_end">@dimen/space_small_3</dimen>



    <dimen name="drawer_padding_top">@dimen/space_small_1</dimen>



    <!-- list_container_padding + list_item_padding_start -->

    <dimen name="table_header_padding_start">32dp</dimen>

    <!-- list_container_padding + list_item_padding_end -->

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

</resources>