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

Commit 853a8e3e authored by Maryam Dehaini's avatar Maryam Dehaini
Browse files

Add hover support to maximize menu 

Open maximize menu when user hovers over maximize window button in
caption.

Bug: 312748319
Test: Manual testing
Change-Id: Ie5bc94c02c5555ea99e6e42f9f6a00c65e348172
parent 19817c18

libs/WindowManager/Shell/res/color/desktop_mode_caption_button_color_selector_dark.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.

  -->



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

    <item android:state_hovered="true"

        android:color="@color/desktop_mode_caption_button_on_hover_dark"/>

    <item android:color="@color/desktop_mode_caption_button"/>

</selector>
 
 No newline at end of file

libs/WindowManager/Shell/res/color/desktop_mode_caption_button_color_selector_light.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.

  -->



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

    <item android:state_hovered="true"

        android:color="@color/desktop_mode_caption_button_on_hover_light"/>

    <item android:color="@color/desktop_mode_caption_button"/>

</selector>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/circular_progress.xml

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

  -->



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

    <item android:id="@android:id/progress">

        <rotate

            android:pivotX="50%"

            android:pivotY="50%"

            android:fromDegrees="275"

            android:toDegrees="275">

            <shape

                android:shape="ring"

                android:thickness="3dp"

                android:innerRadius="17dp"

                android:useLevel="true">

            </shape>

        </rotate>

    </item>

</layer-list>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/rounded_button.xml

0 → 100644
+19 −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="20dp" />

</shape>
 
 No newline at end of file

libs/WindowManager/Shell/res/layout/desktop_mode_app_controls_window_decor.xml

+5 −11
Original line number Diff line number Diff line
@@ -74,17 +74,11 @@ 
        android:layout_height="40dp"

        android:layout_weight="1"/>



    <ImageButton

        android:id="@+id/maximize_window"

        android:layout_width="40dp"

        android:layout_height="40dp"

        android:padding="9dp"

        android:layout_marginEnd="8dp"

        android:contentDescription="@string/maximize_button_text"

        android:src="@drawable/decor_desktop_mode_maximize_button_dark"

        android:scaleType="fitCenter"

        android:gravity="end"

        android:background="@null"/>

    <com.android.wm.shell.windowdecor.MaximizeButtonView

        android:id="@+id/maximize_button_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end"/>



    <ImageButton

        android:id="@+id/close_window"