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

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

Merge "[DocsUI M3] Uplift filter bar (search chips)" into main

parents 05e2bb3e fcf809b5

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

+8 −3
Original line number Diff line number Diff line
@@ -16,7 +16,12 @@ 
  -->



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

    <item android:state_selected="true" android:color="?android:attr/colorSecondary"/>

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

    <item android:state_enabled="false" android:color="@color/chip_background_disable_color"/>

    <!-- Disabled -->

    <item android:color="@android:color/transparent" android:state_enabled="false"/>



    <!-- Selected -->

    <item android:color="?attr/colorSecondaryContainer" android:state_selected="true"/>



    <!-- Not selected: different from default value -->

    <item android:color="@android:color/transparent" />

</selector>
 
 No newline at end of file

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

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

  -->



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

<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_stroke_color.xml

+11 −4
Original line number Diff line number Diff line
@@ -16,8 +16,15 @@ 
  -->



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

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

    <item android:state_pressed="true" android:color="@android:color/transparent"/>

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

    <item android:state_enabled="false" android:color="@android:color/transparent"/>

    <!-- Disabled -->

    <item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_enabled="false"/>



    <!-- Focused: different from default value -->

    <item android:color="?attr/colorPrimary" android:state_focused="true"/>



    <!-- Selected -->

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



    <!-- Other states -->

    <item android:color="?attr/colorOutline"/>

</selector>
 
 No newline at end of file

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

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

  -->



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

<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)/layout/directory_app_bar.xml

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
        android:id="@+id/collapsing_toolbar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:elevation="3dp"

        app:titleEnabled="false"

        app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed">