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

Commit 5219d8f8 authored by Wenbo Jie's avatar Wenbo Jie
Browse files

[DocsUI M3] Fix unit bar alignment issue 

* Make the Name header to vertically align with the thumbnail in
  the list view.
* Restructure the layout to remove unnecessary LinearLayout.
* Remove icon_wrapper id for list view because it's not used any
  more, and update the bot file for the test.

Check the attached bug for the demo.

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

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

+73 −85
Original line number Diff line number Diff line
@@ -32,21 +32,8 @@ 
    android:paddingStart="@dimen/table_header_padding_start"

    android:paddingEnd="@dimen/table_header_padding_end"

    android:visibility="gone">

    <!-- Placeholder for MIME/thumbnail icon -->

    <View

        android:layout_width="@dimen/list_item_icon_size"

        android:layout_height="@dimen/list_item_icon_size"

        android:layout_gravity="center_vertical"

        android:layout_marginEnd="@dimen/list_item_icon_margin_end"

        android:layout_marginStart="0dp"/>



    <!-- Column headers -->

    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="horizontal">



    <com.android.documentsui.sorting.HeaderCell

        android:id="@android:id/title"

        android:layout_width="0dp"
@@ -118,9 +105,10 @@ 


        <include layout="@layout/shared_cell_content_m3" />

    </com.android.documentsui.sorting.HeaderCell>

    </LinearLayout>



    <!-- Placeholder for preview icon in picker mode -->

    <!-- Placeholder for preview icon in picker mode, have the same size as @id/preview_icon in

         item_doc_list.xml, aim to align the file row columns with the able header columns.

     -->

    <View

        android:id="@+id/preview_icon_placeholder"

        android:layout_width="@dimen/list_item_icon_size"

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

+69 −83
Original line number Diff line number Diff line
@@ -21,19 +21,21 @@ 
    android:background="@drawable/list_item_background_m3"

    android:clickable="true"

    android:focusable="true"

    android:orientation="horizontal" >



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:baselineAligned="false"

    android:gravity="center_vertical"

    android:minHeight="@dimen/list_item_height_m3"

        android:orientation="horizontal"

    android:paddingStart="@dimen/list_item_padding_start"

    android:paddingEnd="@dimen/list_item_padding_end"

    android:paddingVertical="@dimen/list_item_padding_vertical">



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="0.4"

        android:layout_marginEnd="12dp"

        android:orientation="horizontal">



        <FrameLayout

            android:id="@+id/icon"

            android:pointerIcon="hand"
@@ -42,7 +44,6 @@ 
            android:layout_marginEnd="@dimen/list_item_icon_margin_end">



            <com.google.android.material.card.MaterialCardView

                android:id="@+id/icon_wrapper"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                style="@style/ListThumbnailCardViewStyle">
@@ -78,21 +79,6 @@ 


        </FrameLayout>



        <!-- This is the one special case where we want baseline alignment! -->



        <LinearLayout

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:orientation="horizontal" >



            <LinearLayout

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="0.4"

                android:layout_marginEnd="12dp"

                android:orientation="horizontal">



        <ImageView

            android:id="@+id/icon_profile_badge"

            android:layout_height="@dimen/briefcase_icon_size_m3"
@@ -107,10 +93,12 @@ 
            android:id="@android:id/title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:ellipsize="middle"

            android:singleLine="true"

            android:textAlignment="viewStart"

            android:textAppearance="@style/FileItemLabelText"/>



    </LinearLayout>



    <com.google.android.material.textview.MaterialTextView
@@ -136,12 +124,12 @@ 
        android:layout_weight="0.2"

        android:textAlignment="viewStart"

        style="@style/FileItemLabelStyle"/>

        </LinearLayout>



    <FrameLayout

        android:id="@+id/preview_icon"

        android:layout_width="@dimen/list_item_icon_size"

        android:layout_height="@dimen/list_item_icon_size"

        android:layout_gravity="center"

        android:layout_marginEnd="@dimen/list_item_icon_margin_end"

        android:focusable="true">
@@ -156,5 +144,3 @@ 
    </FrameLayout>



</LinearLayout>
 
 No newline at end of file
 


</LinearLayout>
 
 No newline at end of file

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

+0 −8
Original line number Diff line number Diff line
@@ -28,14 +28,6 @@ 
    android:background="?attr/colorSurfaceBright"

    android:visibility="gone">



    <!-- Placeholder for MIME/thumbnail icon -->

    <View

        android:layout_width="@dimen/list_item_icon_size"

        android:layout_height="@dimen/list_item_icon_size"

        android:layout_gravity="center_vertical"

        android:layout_marginEnd="@dimen/list_item_icon_margin_end"

        android:layout_marginStart="0dp"/>



    <!-- Column headers: Name only for compact/medium size screen -->

    <com.android.documentsui.sorting.HeaderCell

        android:id="@android:id/title"

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

+99 −115
Original line number Diff line number Diff line
@@ -21,11 +21,6 @@ 
    android:background="@drawable/list_item_background_m3"

    android:clickable="true"

    android:focusable="true"

    android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

    android:baselineAligned="false"

    android:gravity="center_vertical"

    android:minHeight="@dimen/list_item_height_m3"
@@ -42,7 +37,6 @@ 
        android:layout_marginEnd="@dimen/list_item_icon_margin_end">



      <com.google.android.material.card.MaterialCardView

            android:id="@+id/icon_wrapper"

          android:layout_width="match_parent"

          android:layout_height="match_parent"

          style="@style/ListThumbnailCardViewStyle">
@@ -77,14 +71,6 @@ 


    </FrameLayout>



      <LinearLayout

          android:layout_width="0dp"

          android:layout_height="wrap_content"

          android:layout_weight="1"

          android:orientation="horizontal"

          android:layout_gravity="center_vertical"

          android:layout_marginEnd="@dimen/list_item_icon_size">



    <ImageView

        android:id="@+id/icon_profile_badge"

        android:layout_height="@dimen/briefcase_icon_size_m3"
@@ -96,8 +82,9 @@ 
        android:contentDescription="@string/a11y_work" />



    <LinearLayout

            android:layout_width="match_parent"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical">



      <com.google.android.material.textview.MaterialTextView
@@ -129,12 +116,11 @@ 


    </LinearLayout>



      </LinearLayout>



    <FrameLayout

        android:id="@+id/preview_icon"

        android:layout_width="@dimen/list_item_icon_size"

        android:layout_height="@dimen/list_item_icon_size"

        android:layout_gravity="center"

        android:focusable="true"

        android:clickable="true">
@@ -149,5 +135,3 @@ 
    </FrameLayout>



</LinearLayout>
 
 No newline at end of file
 


</LinearLayout>
 
 No newline at end of file

tests/common/com/android/documentsui/bots/DirectoryListBot.java

+1 −2
Original line number Diff line number Diff line
@@ -83,8 +83,7 @@ public class DirectoryListBot extends Bots.BaseBot { 
        mDirListId = mTargetPackage + ":id/dir_list";

        mItemRootId = mTargetPackage + ":id/item_root";

        mPreviewId = mTargetPackage + ":id/preview_icon";

        mListSelectionRegionId =

                mTargetPackage + (isUseMaterial3FlagEnabled() ? ":id/icon_wrapper" : ":id/icon");

        mListSelectionRegionId = mTargetPackage + ":id/icon";

        mGridSelectionRegionId =

                mTargetPackage

                        + (isUseMaterial3FlagEnabled() ? ":id/selection_circle" : ":id/icon");