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

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

Snap for 13076573 from f3343196 to 25Q2-release 

Change-Id: I6c8fad0985e6fe25c59d6e275347465178701930
parents ea3f12d1 f3343196

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->



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

        android:shape="rectangle">

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

        android:shape="rectangle" android:tint="@color/band_select_background">

    <solid android:color="#52000000" /> <!-- 32% alpha -->

    <stroke android:width="1dp" android:color="@color/band_select_border" />

</shape>

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

+4 −1
Original line number Diff line number Diff line
@@ -42,11 +42,14 @@ 
            android:layout_height="@dimen/list_item_icon_size"

            android:layout_marginEnd="@dimen/list_item_icon_margin_end">



            <!-- stroke width will be controlled dynamically in the code. -->

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

                android:id="@+id/icon_wrapper"

                app:cardElevation="0dp"

                app:cardBackgroundColor="@android:color/transparent"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                app:cardBackgroundColor="@android:color/white"

                app:strokeColor="?attr/colorSecondaryContainer"

                app:strokeWidth="0dp">



                <ImageView

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

+4 −1
Original line number Diff line number Diff line
@@ -42,11 +42,14 @@ 
          android:layout_height="@dimen/list_item_icon_size"

          android:layout_marginEnd="@dimen/list_item_icon_margin_end">



        <!-- stroke width will be controlled dynamically in the code. -->

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

            android:id="@+id/icon_wrapper"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            app:cardBackgroundColor="@android:color/transparent"

            app:cardElevation="0dp"

            app:cardBackgroundColor="@android:color/white"

            app:strokeColor="?attr/colorSecondaryContainer"

            app:strokeWidth="0dp">



          <ImageView

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

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
  </color>

  <color name="tool_bar_gradient_max">#7f000000</color>



  <color name="band_select_background">#88ffffff</color>

  <color name="band_select_border">#44000000</color>

  <color name="band_select_background">?attr/colorPrimaryInverse</color>

  <color name="band_select_border">?attr/colorPrimaryContainer</color>



  <color name="downloads_icon_background">#ff4688f2</color>

  <color name="app_icon_background">#ff4688f2</color>

src/com/android/documentsui/dirlist/GridDocumentHolder.java

+2 −1
Original line number Diff line number Diff line
@@ -202,7 +202,8 @@ final class GridDocumentHolder extends DocumentHolder { 
        mIconThumb.animate().cancel();

        mIconThumb.setAlpha(0f);



        mIconHelper.load(mDoc, mIconThumb, mIconMimeLg, mIconMimeSm);

        mIconHelper.load(

                mDoc, mIconThumb, mIconMimeLg, mIconMimeSm, /* thumbnailLoadedCallback= */ null);



        mTitle.setText(mDoc.displayName, TextView.BufferType.SPANNABLE);

        mTitle.setVisibility(View.VISIBLE);