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

Commit 748443d9 authored by Wenbo Jie (介文博)'s avatar Wenbo Jie (介文博) Committed by Android (Google) Code Review
Browse files

Merge "[DocsUI M3] update M3 acronym in the code to use_material3" into main

parents e453b759 b35c48b1

res/flag(com.android.documentsui.flags.use_material3)/color/item_action_icon.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->



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

<!-- TODO(b/379776735): remove this file after use_material3 flag is launched. -->

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

    <item android:state_enabled="false"

        android:alpha="@dimen/root_icon_disabled_alpha"

res/flag(com.android.documentsui.flags.use_material3)/color/search_chip_ripple_color.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  limitations under the License.

  -->



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

<!-- TODO(b/379776735): remove this file after use_material3 flag is launched. -->

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

    <!-- Selected. -->

    <item android:state_pressed="true" android:state_selected="true"

res/flag(com.android.documentsui.flags.use_material3)/color/search_chip_text_color.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  limitations under the License.

  -->



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

<!-- TODO(b/379776735): remove this file after use_material3 flag is launched. -->

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

    <item android:state_selected="true" android:color="@color/search_chip_text_selected_color"/>

    <item android:state_enabled="true" android:color="?android:textColorSecondary"/>

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->



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

<!-- TODO(b/379776735): remove this file after use_material3 flag is launched. -->

<!-- Variant of progress_indeterminate_horizontal_material in frameworks/base/core/res, which

     draws the whole height of the progress bar instead having blank space above and below the

     bar. -->

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
    limitations under the License.

  -->



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

<!-- TODO(b/379776735): remove this file after use_material3 flag is launched. -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:top="-1dp"