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

Commit d14b959d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[DocsUI M3] Fix corners and selection state colours" into main

parents 88c0fc62 b094f2a5

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

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
  -->



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

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

    <item

        android:color="?attr/colorOnPrimaryContainer"

        android:state_selected="true" />

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

</selector>

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

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
  -->



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

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

    <item

        android:color="?attr/colorOnPrimaryContainer"

        android:state_selected="true" />

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

</selector>

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

+5 −4
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ 


    <solid android:color="?android:attr/colorBackground" />



    <corners android:topLeftRadius="@dimen/grid_item_radius"

             android:topRightRadius="@dimen/grid_item_radius"

    <corners

        android:topLeftRadius="@dimen/bottom_sheet_dialog_radius"

        android:topRightRadius="@dimen/bottom_sheet_dialog_radius"

        android:bottomLeftRadius="0dp"

        android:bottomRightRadius="0dp"/>

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

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

-->



<!-- Use @color/list_item_selected_background_color instead of the "?attr/colorPrimary"

<!-- Use @color/list_item_selected_background_color instead of the "?attr/colorPrimaryContainer"

     because the variable is exposed in overlayable.xml. -->

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

    <!-- selected -->

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
  <color name="edge_effect">@android:color/black</color>



  <color name="list_divider_color">#1f000000</color>

  <color name="list_item_selected_background_color">?attr/colorPrimary</color>

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

  <!-- This is used when the app bar is in pinned mode inside the CollapsingToolbarLayout.

       The code in NavigationViewManager assume the value should be a plain color value so we can't

       use the theme attribute "?attr/colorSurfaceContainerHigh" (which is a reference) here, hence