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

Commit 07f9eded authored by Wenbo Jie's avatar Wenbo Jie
Browse files

[DocsUI M3] Update styles for skeleton and app bar 

1. Rename some dimension variable to disambiguate padding/margin.
2. Add padding end for app bar, update padding start for drawer
   layout to align the menu button with the filter bar.
3. Move the padding from the main container level (right section)
   to the main layout to match the new spec. This will make sure
   the scroll area of the nav tree has the same padding top as
   the right section.

Check the bug item for before/after screenshots.

Bug: 377771946
Test: Manually inspect after deployment
Flag: com.android.documentsui.flags.use_material3
Change-Id: I3eece6848731dc811792ca18d5a898ac26090034
parent 03e683e2

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

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ 
        <androidx.coordinatorlayout.widget.CoordinatorLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:orientation="vertical">

            android:orientation="vertical"

            android:paddingTop="@dimen/main_container_padding_top">



            <FrameLayout

                android:layout_width="match_parent"

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

+5 −4
Original line number Diff line number Diff line
@@ -35,7 +35,10 @@ 
            android:layout_height="0dp"

            android:layout_weight="1"

            android:orientation="horizontal"

            android:baselineAligned="false">

            android:baselineAligned="false"

            android:paddingTop="@dimen/layout_padding_top"

            android:paddingBottom="@dimen/layout_padding_bottom"

            android:paddingEnd="@dimen/layout_padding_end">



            <!-- Navigation: left hand side. -->

            <FrameLayout
@@ -50,9 +53,7 @@ 
                android:layout_height="match_parent"

                android:orientation="vertical"

                android:background="@drawable/main_container_background"

                android:layout_marginBottom="@dimen/space_extra_small_6"

                android:layout_marginTop="@dimen/main_container_margin_top"

                android:layout_marginEnd="@dimen/main_container_margin_end">

                android:paddingTop="@dimen/main_container_padding_top">



                <com.google.android.material.appbar.MaterialToolbar

                    android:id="@+id/toolbar"

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

+1 −1
Original line number Diff line number Diff line
@@ -25,5 +25,5 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingHorizontal="@dimen/main_container_padding_start"

        android:paddingVertical="@dimen/search_chip_group_margin_vertical" />

        android:paddingVertical="@dimen/search_chip_group_padding_vertical" />

</HorizontalScrollView>

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

+2 −0
Original line number Diff line number Diff line
@@ -21,5 +21,7 @@ 
    the space between the button the text/title, but since on this layout we don't have the button,

    we zero here, to avoid pushing the title further. -->

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



    <dimen name="toolbar_padding_start">@dimen/main_container_padding_start</dimen>

</resources>

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

+2 −5
Original line number Diff line number Diff line
@@ -30,10 +30,7 @@ 


    <dimen name="main_container_padding_start">@dimen/space_medium_5</dimen>

    <dimen name="main_container_padding_end">@dimen/space_medium_5</dimen>

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

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



    <!-- Main margin is set by main_container_padding_start for the menu button, here is for

    the space between the button the text/title, but since on this layout we don't have the button,

    we zero here, to avoid pushing the title further. -->

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

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

</resources>