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

Commit fbd55955 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge changes I3460e27e,Ib2f1d194,I28b8f266 into udc-dev 

* changes:
  Always close the handle menu if the window loses focus
  Delegate window decor view binding / updating to *ViewHolders
  Update desktop mode caption bar to newest spec
parents 44a27480 cc5d297c

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

+5 −6
Original line number Diff line number Diff line
@@ -17,10 +17,9 @@ 
    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="@color/decor_button_dark_color">

    android:viewportHeight="24">

    <group android:translateY="8.0">

        <path

            android:fillColor="@android:color/white" android:pathData="M3,5V3H21V5Z"/>

            android:fillColor="@android:color/black" android:pathData="M3,5V3H21V5Z"/>

    </group>

</vector>

libs/WindowManager/Shell/res/drawable/ic_baseline_expand_more_24.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

  -->

<vector android:height="24dp" android:tint="#000000"

    android:viewportHeight="24" android:viewportWidth="24"

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

    <path android:fillColor="@android:color/black" android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>

</vector>

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

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

<!--

  ~ Copyright (C) 2022 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.

  -->

<com.android.wm.shell.windowdecor.WindowDecorLinearLayout

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

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/desktop_mode_caption"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_horizontal"

    android:orientation="horizontal"

    android:background="@drawable/desktop_mode_decor_title">



    <LinearLayout

        android:id="@+id/open_menu_button"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        android:clickable="true"

        android:focusable="true"

        android:paddingStart="8dp"

        android:background="?android:selectableItemBackgroundBorderless">



        <ImageView

            android:id="@+id/application_icon"

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:layout_margin="4dp"

            android:layout_gravity="center_vertical"

            android:contentDescription="@string/app_icon_text" />



        <TextView

            android:id="@+id/application_name"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:minWidth="80dp"

            android:textColor="@color/desktop_mode_caption_app_name_dark"

            android:textSize="14sp"

            android:textFontWeight="500"

            android:gravity="center_vertical"

            android:layout_weight="1"

            android:paddingStart="4dp"

            android:paddingEnd="4dp"

            tools:text="Gmail"/>



        <ImageButton

            android:id="@+id/expand_menu_button"

            android:layout_width="32dp"

            android:layout_height="32dp"

            android:padding="4dp"

            android:contentDescription="@string/collapse_menu_text"

            android:src="@drawable/ic_baseline_expand_more_24"

            android:tint="@color/desktop_mode_caption_expand_button_dark"

            android:background="@null"

            android:scaleType="fitCenter"

            android:clickable="false"

            android:focusable="false"

            android:layout_gravity="center_vertical"/>



    </LinearLayout>



    <View

        android:id="@+id/caption_handle"

        android:layout_width="wrap_content"

        android:layout_height="40dp"

        android:layout_weight="1"/>



    <ImageButton

        android:id="@+id/close_window"

        android:layout_width="40dp"

        android:layout_height="40dp"

        android:padding="4dp"

        android:layout_marginEnd="8dp"

        android:contentDescription="@string/close_button_text"

        android:src="@drawable/decor_close_button_dark"

        android:scaleType="fitCenter"

        android:gravity="end"

        android:background="?android:selectableItemBackgroundBorderless"

        android:tint="@color/desktop_mode_caption_close_button_dark"/>

</com.android.wm.shell.windowdecor.WindowDecorLinearLayout>
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
            android:layout_marginEnd="10dp"

            android:contentDescription="@string/collapse_menu_text"

            android:layout_alignParentEnd="true"

            android:background="@drawable/caption_collapse_menu_button"

            android:background="@drawable/ic_baseline_expand_more_24"

            android:layout_centerVertical="true"/>

    </RelativeLayout>

    <LinearLayout

libs/WindowManager/Shell/res/layout/desktop_mode_window_decor.xml→libs/WindowManager/Shell/res/layout/desktop_mode_focused_window_decor.xml

+9 −14
Original line number Diff line number Diff line
@@ -16,26 +16,21 @@ 
  -->

<com.android.wm.shell.windowdecor.WindowDecorLinearLayout

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

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/desktop_mode_caption"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_horizontal"

    android:background="@drawable/desktop_mode_decor_title">

    <Button

        style="@style/CaptionButtonStyle"

        android:id="@+id/back_button"

        android:contentDescription="@string/back_button_text"

        android:background="@drawable/decor_back_button_dark"/>

    <Button



    <ImageButton

        android:id="@+id/caption_handle"

        android:layout_width="128dp"

        android:layout_height="32dp"

        android:layout_margin="5dp"

        android:layout_height="42dp"

        android:contentDescription="@string/handle_text"

        android:background="@drawable/decor_handle_dark"/>

    <Button

        style="@style/CaptionButtonStyle"

        android:id="@+id/close_window"

        android:contentDescription="@string/close_button_text"

        android:background="@drawable/decor_close_button_dark"/>

        android:src="@drawable/decor_handle_dark"

        tools:tint="@color/desktop_mode_caption_handle_bar_dark"

        android:scaleType="fitXY"

        android:background="?android:selectableItemBackground"/>



</com.android.wm.shell.windowdecor.WindowDecorLinearLayout>
 
 No newline at end of file