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

Commit b2d25c7c authored by Wenbo Jie's avatar Wenbo Jie Committed by Wenbo Jie (介文博)
Browse files

[DocsUI M3] Update menu styles 

* 3-dot menu
* context menu

Things TODO:
* context menu window padding
* mouse hover effect for 3-dot menu items

Check the attached bug for demo.

Bug: 377770882
Test: m DocumentsUIGoogle && manual inspection
Flag: com.android.documentsui.flags.use_material3
Change-Id: Ife6c2a055e54594bf07bd9c511f7f3c11c039fb9
parent 7b3baa86

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

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

<!--

  Copyright 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



      https://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:alpha="@dimen/ripple_overlay_alpha" android:color="?attr/colorOnSurface" />

</selector>
 
 No newline at end of file

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

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

-->



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

<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

    <!-- Panel shadow -->

    <item>

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

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

-->



<ripple

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

    android:color="@color/menu_item_ripple_color">



    <item>

        <selector>

            <item android:state_pressed="true">

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

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

                </shape>

            </item>

            <!-- This is the actually the focused state (with keyboard navigation). -->

            <item android:state_selected="true">

                <shape>

                    <stroke android:width="@dimen/focus_ring_width" android:color="?attr/colorSecondary" />

                </shape>

            </item>

        </selector>

    </item>

</ripple>
 
 No newline at end of file

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

+2 −5
Original line number Diff line number Diff line
@@ -74,14 +74,11 @@ 
        <item name="android:background">@drawable/bottom_sheet_dialog_background</item>

    </style>



    <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">

        <item name="android:tint">?android:colorControlNormal</item>

    <style name="OverflowButtonStyle" parent="@style/Widget.Material3.Search.ActionButton.Overflow">

        <item name="android:minWidth">@dimen/button_touch_size</item>

    </style>



    <style name="OverflowMenuStyle" parent="@style/Widget.AppCompat.PopupMenu.Overflow">

        <item name="android:popupBackground">@drawable/menu_dropdown_panel</item>

        <item name="android:dropDownWidth">wrap_content</item>

    <style name="OverflowMenuStyle" parent="@style/Widget.Material3.PopupMenu.Overflow">

        <item name="android:overlapAnchor">false</item>

    </style>

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

+2 −2
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ 
        <item name="fontFamily">@string/config_fontFamily</item>

    </style>



    <style name="MenuItemTextAppearance" parent="@style/TextAppearance.Material3.BodyMedium">

        <item name="android:textSize">14sp</item>

    <style name="MenuItemTextAppearance" parent="@style/TextAppearance.Material3.LabelLarge">

        <item name="android:textColor">?attr/colorOnSurface</item>

        <item name="fontFamily">@string/config_fontFamily</item>

    </style>