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

Commit df66b6d8 authored by Wenbo Jie's avatar Wenbo Jie
Browse files

[DocsUI M3] Uplift File list row layout 

This is the initial change for the file list row which only
covers the layout part, the color and state uplift will come
in the follow-up CLs.

Bug: 381961119
Test: Manual inspection
Flag: com.android.documentsui.flags.use_material3
Change-Id: If6b5ca9a6083ad08e58d7e5b9ba5caf370d346e0
parent 60e78569

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

+26 −54
Original line number Diff line number Diff line
@@ -31,17 +31,17 @@ 
        android:baselineAligned="false"

        android:gravity="center_vertical"

        android:minHeight="@dimen/list_item_height"

        android:orientation="horizontal" >

        android:orientation="horizontal"

        android:paddingStart="@dimen/list_item_padding_start"

        android:paddingEnd="@dimen/list_item_padding_end"

        android:paddingVertical="@dimen/list_item_padding_vertical">



        <FrameLayout

            android:id="@+id/icon"

            android:pointerIcon="hand"

            android:layout_width="@dimen/list_item_width"

            android:layout_height="@dimen/list_item_height"

            android:paddingBottom="@dimen/list_item_icon_padding"

            android:paddingTop="@dimen/list_item_icon_padding"

            android:paddingEnd="16dp"

            android:paddingStart="@dimen/list_item_padding" >

            android:layout_width="@dimen/list_item_icon_size"

            android:layout_height="@dimen/list_item_icon_size"

            android:layout_marginEnd="@dimen/list_item_icon_margin_end">



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

                app:cardElevation="0dp"
@@ -101,68 +101,46 @@ 
                    android:layout_marginEnd="@dimen/briefcase_icon_margin"

                    android:layout_gravity="center_vertical"

                    android:src="@drawable/ic_briefcase"

                    android:tint="?android:attr/colorAccent"

                    android:tint="?attr/colorPrimary"

                    android:contentDescription="@string/a11y_work"/>



                <TextView

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

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:ellipsize="middle"

                    android:ellipsize="end"

                    android:singleLine="true"

                    android:textAlignment="viewStart"

                    android:textAppearance="@style/Subhead"

                    android:textColor="?android:attr/textColorPrimary"/>

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

            </LinearLayout>



            <TextView

                android:id="@+id/file_type"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_marginEnd="12dp"

                android:layout_weight="0.2"

                android:ellipsize="end"

                android:singleLine="true"

                android:textAlignment="viewStart"

                android:textAppearance="@style/Body1"

                android:textColor="?android:attr/textColorSecondary" />

                style="@style/FileItemLabelStyle"/>



            <TextView

                android:id="@+id/size"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_marginEnd="12dp"

                android:layout_weight="0.2"

                android:ellipsize="end"

                android:minWidth="70dp"

                android:singleLine="true"

                android:textAlignment="viewEnd"

                android:textAppearance="@style/Body1"

                android:textColor="?android:attr/textColorSecondary" />

                style="@style/FileItemLabelStyle"/>



            <TextView

                android:id="@+id/date"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_marginEnd="12dp"

                android:layout_weight="0.2"

                android:ellipsize="end"

                android:minWidth="70dp"

                android:singleLine="true"

                android:textAlignment="viewEnd"

                android:textAppearance="@style/Body1"

                android:textColor="?android:attr/textColorSecondary" />

                style="@style/FileItemLabelStyle"/>

        </LinearLayout>



        <FrameLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content">



        <FrameLayout

            android:id="@+id/preview_icon"

                android:layout_width="@dimen/list_item_width"

                android:layout_height="@dimen/list_item_height"

                android:padding="@dimen/list_item_icon_padding"

            android:layout_width="@dimen/list_item_icon_size"

            android:layout_height="@dimen/list_item_icon_size"

            android:layout_marginEnd="@dimen/list_item_icon_margin_end"

            android:focusable="true">



            <ImageView
@@ -170,17 +148,11 @@ 
                android:layout_height="@dimen/check_icon_size"

                android:layout_gravity="center"

                android:scaleType="fitCenter"

                    android:tint="?android:attr/textColorPrimary"

                android:tint="?attr/colorPrimary"

                android:src="@drawable/ic_zoom_out"/>



        </FrameLayout>



            <android.widget.Space

                android:layout_width="@dimen/list_item_width"

                android:layout_height="@dimen/list_item_height"/>



        </FrameLayout>



    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

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

+13 −22
Original line number Diff line number Diff line
@@ -31,17 +31,17 @@ 
        android:baselineAligned="false"

        android:gravity="center_vertical"

        android:minHeight="@dimen/list_item_height"

        android:orientation="horizontal">

        android:orientation="horizontal"

        android:paddingStart="@dimen/list_item_padding_start"

        android:paddingEnd="@dimen/list_item_padding_end"

        android:paddingVertical="@dimen/list_item_padding_vertical">



      <FrameLayout

          android:id="@+id/icon"

          android:pointerIcon="hand"

          android:layout_width="@dimen/list_item_width"

          android:layout_height="@dimen/list_item_height"

          android:paddingBottom="@dimen/list_item_icon_padding"

          android:paddingTop="@dimen/list_item_icon_padding"

          android:paddingEnd="16dp"

          android:paddingStart="@dimen/list_item_padding">

          android:layout_width="@dimen/list_item_icon_size"

          android:layout_height="@dimen/list_item_icon_size"

          android:layout_marginEnd="@dimen/list_item_icon_margin_end">



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

            android:layout_width="match_parent"
@@ -84,7 +84,7 @@ 
          android:layout_weight="1"

          android:orientation="vertical"

          android:layout_gravity="center_vertical"

          android:layout_marginEnd="@dimen/list_item_padding">

          android:layout_marginEnd="@dimen/list_item_icon_size">



        <LinearLayout

            android:layout_width="wrap_content"
@@ -98,7 +98,7 @@ 
              android:layout_marginEnd="@dimen/briefcase_icon_margin"

              android:layout_gravity="center_vertical"

              android:src="@drawable/ic_briefcase"

              android:tint="?android:attr/colorAccent"

              android:tint="?attr/colorPrimary"

              android:contentDescription="@string/a11y_work" />



          <TextView
@@ -108,7 +108,7 @@ 
              android:ellipsize="end"

              android:singleLine="true"

              android:textAlignment="viewStart"

              android:textAppearance="?android:attr/textAppearanceListItem" />

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



        </LinearLayout>
@@ -117,7 +117,6 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:baselineAligned="false"

            android:layout_marginTop="4dp"

            android:gravity="center_vertical"

            android:orientation="horizontal">
@@ -135,9 +134,8 @@ 


      <FrameLayout

          android:id="@+id/preview_icon"

          android:layout_width="@dimen/list_item_width"

          android:layout_height="@dimen/list_item_height"

          android:padding="@dimen/list_item_icon_padding"

          android:layout_width="@dimen/list_item_icon_size"

          android:layout_height="@dimen/list_item_icon_size"

          android:focusable="true"

          android:clickable="true">
@@ -146,18 +144,11 @@ 
            android:layout_height="@dimen/check_icon_size"

            android:layout_gravity="center"

            android:scaleType="fitCenter"

            android:tint="?android:attr/colorControlNormal"

            android:tint="?attr/colorOnSurface"

            android:src="@drawable/ic_zoom_out" />



      </FrameLayout>



    </LinearLayout>



  <View

      android:layout_width="match_parent"

      android:layout_height="1dp"

      android:layout_marginStart="72dp"

      android:layout_marginEnd="8dp"

      android:background="?android:strokeColor" />



</LinearLayout>
 
 No newline at end of file

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

+2 −0
Original line number Diff line number Diff line
@@ -24,5 +24,7 @@ 
    <dimen name="search_bar_text_margin_start">0dp</dimen>



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



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

</resources>

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

+4 −2
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ 
    <dimen name="grid_padding_horiz">16dp</dimen>

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



    <dimen name="list_item_padding">24dp</dimen>

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

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

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

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

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



    <dimen name="max_drawer_width">320dp</dimen>

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

+11 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <dimen name="tab_selector_indicator_height">2dp</dimen>

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

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

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

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

    <dimen name="icon_size">40dp</dimen>

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

    <dimen name="root_icon_size">24dp</dimen>
@@ -33,7 +33,7 @@ 
    <dimen name="root_action_icon_size">24dp</dimen>

    <!-- TODO(b/379776735): remove this after M3 uplift -->

    <dimen name="root_icon_disabled_alpha">?android:attr/disabledAlpha</dimen>

    <dimen name="check_icon_size">30dp</dimen>

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

    <dimen name="zoom_icon_size">24dp</dimen>

    <dimen name="list_item_thumbnail_size">40dp</dimen>

    <dimen name="grid_item_icon_size">30dp</dimen>
@@ -46,13 +46,20 @@ 
    <dimen name="grid_item_margin">6dp</dimen>

    <dimen name="grid_padding_horiz">4dp</dimen>

    <dimen name="grid_padding_vert">4dp</dimen>

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

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

    <dimen name="list_item_padding_end">8dp</dimen>

    <dimen name="list_item_padding_vertical">4dp</dimen>

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

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

    <!-- TODO(b/379776735): remove this block after M3 uplift -->

    <dimen name="list_item_width">72dp</dimen>

    <dimen name="list_item_height">72dp</dimen>

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

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

    <dimen name="list_divider_inset">72dp</dimen>

    <!-- block end -->

    <dimen name="breadcrumb_item_padding">8dp</dimen>

    <dimen name="breadcrumb_item_height">36dp</dimen>

    <dimen name="list_divider_inset">72dp</dimen>

    <dimen name="dir_elevation">8dp</dimen>

    <dimen name="drag_shadow_size">120dp</dimen>

    <dimen name="grid_item_elevation">2dp</dimen>