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

Commit 81b5c9ff authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13329326 from c89bda91 to 25Q3-release 

Change-Id: I0f4413c3435e09e03884232c7dc1716a836fed21
parents f3c3b180 c89bda91

flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -41,14 +41,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    name: "hide_roots_on_desktop_ro"

    namespace: "documentsui"

    description: "Enables the hiding of the Images/Videos/Audio/Documents roots on desktop."

    bug: "381959330"

    is_fixed_read_only: true

}



flag {

    name: "redirect_get_content_ro"

    namespace: "documentsui"

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