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

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

Merge "Rename overlaid colors when Material flag is enabled" into main

parents d5a416b4 f0503e84

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

+6 −8
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
     limitations under the License.

-->



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

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

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

    android:color="@color/list_item_ripple_color">
@@ -38,7 +36,7 @@ 
                        android:top="@dimen/focus_ring_gap">

                        <shape>

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

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

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

                        </shape>

                    </item>

                    <item
@@ -66,7 +64,7 @@ 
                    <item>

                        <shape>

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

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

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

                        </shape>

                    </item>

                    <item>
@@ -82,7 +80,7 @@ 
                    <item>

                        <shape>

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

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

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

                        </shape>

                    </item>

                    <item>
@@ -102,7 +100,7 @@ 
                        android:top="@dimen/focus_ring_gap">

                        <shape>

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

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

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

                        </shape>

                    </item>

                    <item>
@@ -120,7 +118,7 @@ 
                    <item>

                        <shape>

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

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

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

                        </shape>

                    </item>

                    <item>
@@ -134,7 +132,7 @@ 
            <item android:state_selected="true">

                <shape>

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

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

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

                </shape>

            </item>

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

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
         need to explicitly apply the drawable if the other items also need this mask. -->

    <item

        android:id="@android:id/mask"

        android:drawable="@drawable/root_list_selector"/>

        android:drawable="@drawable/root_item_selector"/>



    <item>

        <selector>
@@ -93,7 +93,7 @@ 
                    </item>

                </layer-list>

            </item>

            <item android:state_activated="true" android:drawable="@drawable/root_list_selector"/>

            <item android:state_activated="true" android:drawable="@drawable/root_item_selector"/>



            <!-- Unselected. -->

            <item app:state_highlighted="true">

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

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2024 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

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

    <!-- The color here is used as activated color in root_item_background.xml. -->

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

</shape>

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

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

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

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

    <!-- The color here is used as activated color in root_item_background.xml. -->

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

+3 −0
Original line number Diff line number Diff line
@@ -65,7 +65,10 @@ 
  <color name="edge_effect">@android:color/black</color>



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



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

  <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