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

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

Snap for 13204655 from b3003fa2 to 25Q2-release 

Change-Id: I00a2348050d70ce8b730a0c5beeed925cedc69db
parents 6b047d09 b3003fa2

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

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 


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

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

    <!-- By default <ripple> introduces a gray-ish layer for the focused state which we don't

         want, hence explicitly setting focused ripple color to transparent to get rid of that.

    -->

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

    <item android:state_selected="true" android:alpha="@dimen/ripple_overlay_alpha"

        android:color="?attr/colorOnPrimaryContainer" />

    <item android:alpha="@dimen/ripple_overlay_alpha"

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

+57 −0
Original line number Diff line number Diff line
@@ -26,6 +26,41 @@ 
    <item>

        <selector>

            <!-- Selected -->

            <item

                android:state_selected="true"

                android:state_focused="true"

                android:state_hovered="true">

                <layer-list>

                    <item

                        android:bottom="@dimen/focus_ring_gap"

                        android:left="@dimen/focus_ring_gap"

                        android:right="@dimen/focus_ring_gap"

                        android:top="@dimen/focus_ring_gap">

                        <shape>

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

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

                        </shape>

                    </item>

                    <item

                        android:bottom="@dimen/focus_ring_gap"

                        android:left="@dimen/focus_ring_gap"

                        android:right="@dimen/focus_ring_gap"

                        android:top="@dimen/focus_ring_gap">

                        <shape android:tint="?attr/colorOnPrimaryContainer">

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

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

                        </shape>

                    </item>

                    <item>

                        <shape>

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

                            <stroke

                                android:width="@dimen/focus_ring_width"

                                android:color="?attr/colorSecondary" />

                        </shape>

                    </item>

                </layer-list>

            </item>

            <item android:state_selected="true" android:state_drag_hovered="true">

                <layer-list>

                    <item>
@@ -104,6 +139,28 @@ 
            </item>



            <!-- Unselected -->

            <item android:state_focused="true" android:state_hovered="true">

                <layer-list>

                    <item

                        android:bottom="@dimen/focus_ring_gap"

                        android:left="@dimen/focus_ring_gap"

                        android:right="@dimen/focus_ring_gap"

                        android:top="@dimen/focus_ring_gap">

                        <shape android:tint="?attr/colorOnSurface">

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

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

                        </shape>

                    </item>

                    <item>

                        <shape>

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

                            <stroke

                                android:width="@dimen/focus_ring_width"

                                android:color="?attr/colorSecondary" />

                        </shape>

                    </item>

                </layer-list>

            </item>

            <item android:state_drag_hovered="true">

                <shape android:tint="?attr/colorOnSurface">

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

res/flag(com.android.documentsui.flags.use_material3)/layout-w600dp/fragment_save_cancel_button.xml

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

<!-- Copyright (C) 2025 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.

-->

<com.google.android.material.button.MaterialButton

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@android:id/button2"

    style="@style/MaterialTonalButton"

    app:cornerRadius="@dimen/button_corner_radius"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginStart="4dp"

    android:layout_marginEnd="4dp"

    android:text="@android:string/cancel"/>

res/flag(com.android.documentsui.flags.use_material3)/layout/drawer_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
                    android:id="@+id/container_save"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:background="?android:attr/colorBackgroundFloating" />

                    android:background="?attr/colorSurfaceContainer" />



            </LinearLayout>

res/flag(com.android.documentsui.flags.use_material3)/layout/fixed_layout.xml

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
        android:paddingTop="@dimen/layout_padding_top"

        android:paddingBottom="@dimen/layout_padding_bottom"

        android:paddingEnd="@dimen/layout_padding_end">



        <!-- Navigation: left hand side. -->

        <FrameLayout

            android:id="@+id/container_roots"
@@ -124,7 +123,7 @@ 
                android:id="@+id/container_save"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:background="?android:attr/colorBackgroundFloating"

                android:background="?attr/colorSurfaceContainer"

                android:elevation="8dp" />



        </LinearLayout>