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

Commit 6d37135e authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Show maximize menu when user long clicks maximize button on caption" into main

parents 6e228244 c4f6fac5

core/java/android/window/TaskConstants.java

+6 −0
Original line number Diff line number Diff line
@@ -80,6 +80,12 @@ public class TaskConstants { 
     */

    public static final int TASK_CHILD_LAYER_RESIZE_VEIL = 6 * TASK_CHILD_LAYER_REGION_SIZE;



    /**

     * Floating menus belonging to a task (e.g. maximize menu).

     * @hide

     */

    public  static final int TASK_CHILD_LAYER_FLOATING_MENU = 7 * TASK_CHILD_LAYER_REGION_SIZE;



    /**

     * Z-orders of task child layers other than activities, task fragments and layers interleaved

     * with them, e.g. IME windows. [-10000, 10000) is reserved for these layers.

libs/WindowManager/Shell/res/color/desktop_mode_maximize_menu_button_color_selector.xml

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

<!--

  ~ Copyright (C) 2023 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_pressed="true"

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

    <item android:state_hovered="true"

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

    <item android:state_focused="true"

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

    <item android:state_selected="true"

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

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

</selector>
 
 No newline at end of file

libs/WindowManager/Shell/res/color/desktop_mode_maximize_menu_button_outline_color_selector.xml

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

<!--

  ~ Copyright (C) 2023 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_pressed="true"

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

    <item android:state_hovered="true"

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

    <item android:state_focused="true"

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

    <item android:state_selected="true"

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

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

</selector>
 
 No newline at end of file

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

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

<!--

  ~ Copyright (C) 2023 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 android:shape="rectangle"

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

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

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

</shape>