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

Commit a7c2f250 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13450015 from db742eef to 25Q3-release 

Change-Id: Ie56fee73920504b8dcd4be0c7334da083143fb98
parents a98d0d3a db742eef

proguard.flags

+2 −1
Original line number Original line Diff line number Diff line
@@ -218,5 +218,6 @@ 




-keep class com.android.documentsui.util.Material3Config {

-keep class com.android.documentsui.util.Material3Config {

  static int getRes(int);

  static int getRes(int);

  static void overrideForTest(java.util.Map);

  static void overrideMappingForTest(java.util.Map);

  static void setEnabledForTest(boolean);

}
 
}

res/flag(com.android.documentsui.flags.use_material3)/drawable/breadcrumb_item_mask.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

-->





<shape xmlns:android="http://schemas.android.com/apk/res/android">

<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <corners android:radius="@dimen/breadcrumb_item_height" />

    <corners android:radius="@dimen/breadcrumb_item_height_m3" />

    <!-- The color here doesn't matter, it's just being used as a mask. -->

    <!-- The color here doesn't matter, it's just being used as a mask. -->

    <solid android:color="@android:color/white" />

    <solid android:color="@android:color/white" />

</shape>
 
</shape>
 
 No newline at end of file

res/flag(com.android.documentsui.flags.use_material3)/drawable/list_item_mask.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

-->





<shape xmlns:android="http://schemas.android.com/apk/res/android">

<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <corners android:radius="@dimen/list_item_height" />

    <corners android:radius="@dimen/list_item_height_m3" />

    <!-- The color here doesn't matter, it's just being used as a mask. -->

    <!-- The color here doesn't matter, it's just being used as a mask. -->

    <solid android:color="@android:color/white" />

    <solid android:color="@android:color/white" />

</shape>
 
</shape>
 
 No newline at end of file

res/flag(com.android.documentsui.flags.use_material3)/layout-w600dp-h600dp/fragment_save_cancel_button.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@android:id/button2"

    android:id="@android:id/button2"

    style="@style/MaterialTonalButton"

    style="@style/MaterialTonalButton"

    app:cornerRadius="@dimen/button_corner_radius"

    app:cornerRadius="@dimen/button_corner_radius_m3"

    android:layout_width="wrap_content"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginBottom="@dimen/picker_saver_button_gap"

    android:layout_marginBottom="@dimen/picker_saver_button_gap"

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

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

    android:paddingStart="@dimen/table_header_padding_start"

    android:paddingEnd="@dimen/table_header_padding_end"

    android:paddingEnd="@dimen/table_header_padding_end"

    android:visibility="gone">

    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 -->

    <!-- Column headers -->

    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="horizontal">



    <com.android.documentsui.sorting.HeaderCell

    <com.android.documentsui.sorting.HeaderCell

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

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

        android:layout_width="0dp"

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




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

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

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

    </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

    <View

        android:id="@+id/preview_icon_placeholder"

        android:id="@+id/preview_icon_placeholder"

        android:layout_width="@dimen/list_item_icon_size"

        android:layout_width="@dimen/list_item_icon_size"