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

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

Snap for 14047163 from 4b6ec46c to 25Q4-release 

Change-Id: I9c19b7afeeec5db371ea1fca4616438971980de6
parents 7b9f2007 4b6ec46c

OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -7,5 +7,6 @@ include platform/frameworks/base:/core/java/android/os/storage/OWNERS 
alexbn@google.com

austinct@google.com

benreich@google.com

erfanio@google.com

lucmult@google.com

wenbojie@google.com

res/drawable/ic_menu_restore_from_trash.xml

0 → 100644
+27 −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.

-->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportHeight="960"

    android:viewportWidth="960">



    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:pathData="M440,640L520,640L520,474L584,536L640,480L480,320L320,480L376,536L440,474L440,640ZM280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z" />



</vector>

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

0 → 100644
+27 −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.

-->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportHeight="960"

    android:viewportWidth="960">



    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:pathData="M440,640L520,640L520,474L584,536L640,480L480,320L320,480L376,536L440,474L440,640ZM280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z" />



</vector>

res/flag(com.android.documentsui.flags.use_material3)/menu/action_mode_menu_m3.xml

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ 
        android:title="@string/menu_move_to_trash"

        android:showAsAction="always"

        app:showAsAction="always"/>

    <item

        android:id="@+id/action_menu_restore_from_trash"

        android:title="@string/menu_restore_from_trash"

        android:showAsAction="never"

        app:showAsAction="never"/>

    <item

        android:id="@+id/action_menu_delete"

        android:icon="@drawable/ic_menu_delete"

res/menu/action_mode_menu.xml

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ 
        android:icon="@drawable/ic_menu_delete"

        android:title="@string/menu_move_to_trash"

        android:showAsAction="always" />

    <item

        android:id="@+id/action_menu_restore_from_trash"

        android:title="@string/menu_restore_from_trash"

        android:showAsAction="never" />

    <item

        android:id="@+id/action_menu_delete"

        android:icon="@drawable/ic_menu_delete"