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

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

Snap for 13256841 from 343bf4b4 to 25Q2-release 

Change-Id: Icc91d11c3dce5b6a95e7aa0c1a41068f71f032de
parents eb3508c8 343bf4b4

proguard.flags

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
  int dir_menu_view_in_owner;

  int drawer_layout;

  int inspector_details_view;

  int job_progress_panel_title;

  int option_menu_create_dir;

  int option_menu_debug;

  int option_menu_extract_all;

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

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

  -->



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

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

</selector>

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

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

-->



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

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

    <!-- The color here doesn't matter, it's just being used as a mask. -->

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

</shape>
 
 No newline at end of file

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

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

-->



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

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

    android:color="@color/grid_item_ripple_color">



    <!-- The mask below only works for the ripple itself, doesn't work for other <item>s, we

         need to explicitly apply the drawable if the other items also need this mask. -->

    <item android:id="@android:id/mask" android:drawable="@drawable/grid_item_mask"/>



    <item>

        <selector>

            <!-- selected -->

            <item

                android:state_focused="true"
@@ -138,3 +146,5 @@ 
                </shape>

            </item>

        </selector>

    </item>

</ripple>
 
 No newline at end of file

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

+8 −0
Original line number Diff line number Diff line
@@ -116,4 +116,12 @@ 
        </LinearLayout>



    </androidx.drawerlayout.widget.DrawerLayout>



    <!-- Peek overlay -->

    <FrameLayout

        android:id="@+id/peek_overlay"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone" />



</androidx.coordinatorlayout.widget.CoordinatorLayout>