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

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

Merge "Update maximize menu to new specs" into main

parents eab7a6d5 ff8ba2c4

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

+6 −8
Original line number Diff line number Diff line
@@ -14,15 +14,13 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

-->



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

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/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"/>

        android:color="?androidprv:attr/colorAccentPrimary"/>

    <item android:state_focused="true"

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

        android:color="?androidprv:attr/colorAccentPrimary"/>

    <item android:state_selected="true"

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

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

        android:color="?androidprv:attr/colorAccentPrimary"/>

    <item android:color="?androidprv:attr/materialColorOutlineVariant"/>

</selector>
 
 No newline at end of file

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

deleted100644 → 0
+0 −28
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_maximize_button_background.xml→libs/WindowManager/Shell/res/drawable/desktop_mode_maximize_menu_button_background.xml

+1 −2
Original line number Diff line number Diff line
@@ -19,6 +19,5 @@ 
    android:shape="rectangle">

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

    <corners

        android:radius="@dimen/desktop_mode_maximize_menu_buttons_large_corner_radius"/>

    <stroke android:width="1dp" android:color="@color/desktop_mode_maximize_menu_button_outline_color_selector"/>

        android:radius="@dimen/desktop_mode_maximize_menu_buttons_radius"/>

</shape>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/desktop_mode_maximize_menu_snap_left_button_background.xml→libs/WindowManager/Shell/res/drawable/desktop_mode_maximize_menu_layout_background.xml

+3 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~
@@ -17,12 +16,9 @@ 
-->



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

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

    android:shape="rectangle">

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

    <corners

        android:topLeftRadius="@dimen/desktop_mode_maximize_menu_buttons_large_corner_radius"

        android:topRightRadius="@dimen/desktop_mode_maximize_menu_buttons_small_corner_radius"

        android:bottomLeftRadius="@dimen/desktop_mode_maximize_menu_buttons_large_corner_radius"

        android:bottomRightRadius="@dimen/desktop_mode_maximize_menu_buttons_small_corner_radius"/>

    <stroke android:width="1dp" android:color="@color/desktop_mode_maximize_menu_button_outline_color_selector"/>

        android:radius="@dimen/desktop_mode_maximize_menu_buttons_outline_radius"/>

    <stroke android:width="1dp" android:color="?androidprv:attr/materialColorOutlineVariant"/>

</shape>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/desktop_mode_maximize_menu_snap_right_button_background.xml→libs/WindowManager/Shell/res/drawable/desktop_mode_maximize_menu_layout_background_on_hover.xml

+3 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~
@@ -17,12 +16,9 @@ 
-->



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

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

    android:shape="rectangle">

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

    <corners

        android:topLeftRadius="@dimen/desktop_mode_maximize_menu_buttons_small_corner_radius"

        android:topRightRadius="@dimen/desktop_mode_maximize_menu_buttons_large_corner_radius"

        android:bottomLeftRadius="@dimen/desktop_mode_maximize_menu_buttons_small_corner_radius"

        android:bottomRightRadius="@dimen/desktop_mode_maximize_menu_buttons_large_corner_radius"/>

    <stroke android:width="1dp" android:color="@color/desktop_mode_maximize_menu_button_outline_color_selector"/>

        android:radius="@dimen/desktop_mode_maximize_menu_buttons_outline_radius"/>

    <stroke android:width="1dp" android:color="?androidprv:attr/colorAccentPrimary"/>

</shape>
 
 No newline at end of file