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

Commit 12267232 authored by Fabio Muratori's avatar Fabio Muratori Committed by Android (Google) Code Review
Browse files

Merge "Update menu details for desktop windowing:" into main

parents 3f920387 07d2f4be
Loading
Loading
Loading
Loading
+51 −96
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@
            android:id="@+id/application_icon"
            android:layout_width="@dimen/desktop_mode_caption_icon_radius"
            android:layout_height="@dimen/desktop_mode_caption_icon_radius"
            android:layout_marginStart="12dp"
            android:layout_marginStart="10dp"
            android:layout_marginEnd="12dp"
            android:contentDescription="@string/app_icon_text"
            android:importantForAccessibility="no"/>
@@ -53,10 +53,9 @@

        <com.android.wm.shell.windowdecor.HandleMenuImageButton
            android:id="@+id/collapse_menu_button"
            android:layout_width="32dp"
            android:layout_height="32dp"
            android:padding="4dp"
            android:layout_marginEnd="14dp"
            android:layout_width="16dp"
            android:layout_height="16dp"
            android:layout_marginEnd="16dp"
            android:layout_marginStart="14dp"
            android:contentDescription="@string/collapse_menu_text"
            android:src="@drawable/ic_baseline_expand_more_24"
@@ -78,40 +77,55 @@

        <ImageButton
            android:id="@+id/fullscreen_button"
            android:layout_marginEnd="4dp"
            android:paddingStart="16dp"
            android:paddingEnd="12dp"
            android:contentDescription="@string/fullscreen_text"
            android:src="@drawable/desktop_mode_ic_handle_menu_fullscreen"
            android:tint="@androidprv:color/materialColorOnSurface"
            android:layout_weight="1"
            style="@style/DesktopModeHandleMenuWindowingButton"/>

        <Space
            android:layout_width="0dp"
            android:layout_height="0dp"
            android:layout_weight="1"/>

        <ImageButton
            android:id="@+id/split_screen_button"
            android:layout_marginStart="4dp"
            android:layout_marginEnd="4dp"
            android:paddingStart="14dp"
            android:paddingEnd="14dp"
            android:contentDescription="@string/split_screen_text"
            android:src="@drawable/desktop_mode_ic_handle_menu_splitscreen"
            android:tint="@androidprv:color/materialColorOnSurface"
            android:layout_weight="1"
            style="@style/DesktopModeHandleMenuWindowingButton"/>

        <Space
            android:id="@+id/floating_button_space"
            android:layout_width="0dp"
            android:layout_height="0dp"
            android:layout_weight="1"/>

        <ImageButton
            android:id="@+id/floating_button"
            android:layout_marginStart="4dp"
            android:layout_marginEnd="4dp"
            android:paddingStart="14dp"
            android:paddingEnd="14dp"
            android:contentDescription="@string/float_button_text"
            android:src="@drawable/desktop_mode_ic_handle_menu_floating"
            android:tint="@androidprv:color/materialColorOnSurface"
            android:layout_weight="1"
            style="@style/DesktopModeHandleMenuWindowingButton"/>

        <Space
            android:id="@+id/desktop_button_space"
            android:layout_width="0dp"
            android:layout_height="0dp"
            android:layout_weight="1"/>

        <ImageButton
            android:id="@+id/desktop_button"
            android:layout_marginStart="4dp"
            android:paddingStart="12dp"
            android:paddingEnd="16dp"
            android:contentDescription="@string/desktop_text"
            android:src="@drawable/desktop_mode_ic_handle_menu_desktop"
            android:tint="@androidprv:color/materialColorOnSurface"
            android:layout_weight="1"
            style="@style/DesktopModeHandleMenuWindowingButton"/>

    </LinearLayout>
@@ -126,77 +140,33 @@
        android:elevation="@dimen/desktop_mode_handle_menu_pill_elevation"
        android:background="@drawable/desktop_mode_decor_handle_menu_background">

        <LinearLayout
        <com.android.wm.shell.windowdecor.HandleMenuActionButton
            android:id="@+id/screenshot_button"
            android:contentDescription="@string/screenshot_text"
            style="@style/DesktopModeHandleMenuActionButtonLayout">

            <ImageView
                android:id="@+id/image"
                android:src="@drawable/desktop_mode_ic_handle_menu_screenshot"
                android:importantForAccessibility="no"
                style="@style/DesktopModeHandleMenuActionButtonImage"/>

            <com.android.wm.shell.windowdecor.MarqueedTextView
                android:id="@+id/label"
            android:text="@string/screenshot_text"
                style="@style/DesktopModeHandleMenuActionButtonTextView"/>

        </LinearLayout>
            android:src="@drawable/desktop_mode_ic_handle_menu_screenshot"
            style="@style/DesktopModeHandleMenuActionButton"/>

        <LinearLayout
        <com.android.wm.shell.windowdecor.HandleMenuActionButton
            android:id="@+id/new_window_button"
            android:contentDescription="@string/new_window_text"
            style="@style/DesktopModeHandleMenuActionButtonLayout">

            <ImageView
                android:id="@+id/image"
                android:src="@drawable/desktop_mode_ic_handle_menu_new_window"
                android:importantForAccessibility="no"
                style="@style/DesktopModeHandleMenuActionButtonImage"/>

            <com.android.wm.shell.windowdecor.MarqueedTextView
                android:id="@+id/label"
            android:text="@string/new_window_text"
                style="@style/DesktopModeHandleMenuActionButtonTextView"/>

        </LinearLayout>
            android:src="@drawable/desktop_mode_ic_handle_menu_new_window"
            style="@style/DesktopModeHandleMenuActionButton"/>

        <LinearLayout
        <com.android.wm.shell.windowdecor.HandleMenuActionButton
            android:id="@+id/manage_windows_button"
            android:contentDescription="@string/manage_windows_text"
            style="@style/DesktopModeHandleMenuActionButtonLayout">

            <ImageView
                android:id="@+id/image"
                android:src="@drawable/desktop_mode_ic_handle_menu_manage_windows"
                android:importantForAccessibility="no"
                style="@style/DesktopModeHandleMenuActionButtonImage"/>

            <com.android.wm.shell.windowdecor.MarqueedTextView
                android:id="@+id/label"
            android:text="@string/manage_windows_text"
                style="@style/DesktopModeHandleMenuActionButtonTextView"/>

        </LinearLayout>
            android:src="@drawable/desktop_mode_ic_handle_menu_manage_windows"
            style="@style/DesktopModeHandleMenuActionButton"/>

        <LinearLayout
        <com.android.wm.shell.windowdecor.HandleMenuActionButton
            android:id="@+id/change_aspect_ratio_button"
            android:contentDescription="@string/change_aspect_ratio_text"
            style="@style/DesktopModeHandleMenuActionButtonLayout">

            <ImageView
                android:id="@+id/image"
                android:src="@drawable/desktop_mode_ic_handle_menu_change_aspect_ratio"
                android:importantForAccessibility="no"
                style="@style/DesktopModeHandleMenuActionButtonImage"/>

            <com.android.wm.shell.windowdecor.MarqueedTextView
                android:id="@+id/label"
            android:text="@string/change_aspect_ratio_text"
                style="@style/DesktopModeHandleMenuActionButtonTextView"/>

        </LinearLayout>
            android:src="@drawable/desktop_mode_ic_handle_menu_change_aspect_ratio"
            style="@style/DesktopModeHandleMenuActionButton"/>
    </LinearLayout>

    <LinearLayout
@@ -209,29 +179,14 @@
        android:elevation="@dimen/desktop_mode_handle_menu_pill_elevation"
        android:background="@drawable/desktop_mode_decor_handle_menu_background">

        <LinearLayout
        <com.android.wm.shell.windowdecor.HandleMenuActionButton
            android:id="@+id/open_in_app_or_browser_button"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_weight="1"
            android:layout_marginEnd="8dp"
            android:gravity="start|center_vertical"
            android:paddingStart="16dp"
            android:contentDescription="@string/open_in_browser_text"
            android:background="?android:selectableItemBackground">

            <ImageView
                android:id="@+id/image"
                android:src="@drawable/desktop_mode_ic_handle_menu_open_in_browser"
                android:importantForAccessibility="no"
                style="@style/DesktopModeHandleMenuActionButtonImage"/>

            <com.android.wm.shell.windowdecor.MarqueedTextView
                android:id="@+id/label"
            android:text="@string/open_in_browser_text"
                style="@style/DesktopModeHandleMenuActionButtonTextView"/>

        </LinearLayout>
            android:src="@drawable/desktop_mode_ic_handle_menu_open_in_browser"
            style="@style/DesktopModeHandleMenuActionButton"
            android:layout_width="0dp"
            android:layout_weight="1"/>

        <ImageButton
            android:id="@+id/open_by_default_button"
+38 −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.
  -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/action_button"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:gravity="start|center_vertical"
    android:paddingHorizontal="16dp"
    android:clickable="true"
    android:focusable="true"
    android:orientation="horizontal"
    android:background="?android:attr/selectableItemBackground">

    <ImageView
        android:id="@+id/image"
        android:contentDescription="@+id/label"
        style="@style/DesktopModeHandleMenuActionButtonImage"/>

    <com.android.wm.shell.windowdecor.MarqueedTextView
        android:id="@+id/label"
        style="@style/DesktopModeHandleMenuActionButtonTextView"/>
</LinearLayout>
+7 −0
Original line number Diff line number Diff line
@@ -23,4 +23,11 @@
    <declare-styleable name="MessageState">
        <attr name="state_task_focused" format="boolean"/>
    </declare-styleable>

    <declare-styleable name="HandleMenuActionButton">
        <attr name="android:text" format="string" />
        <attr name="android:textColor" format="color" />
        <attr name="android:src" format="reference" />
        <attr name="android:drawableTint" format="color" />
    </declare-styleable>
</resources>
+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@
    <dimen name="desktop_mode_handle_menu_corner_radius">26dp</dimen>

    <!-- The radius of the caption menu icon. -->
    <dimen name="desktop_mode_caption_icon_radius">24dp</dimen>
    <dimen name="desktop_mode_caption_icon_radius">32dp</dimen>

    <!-- The radius of the caption menu shadow. -->
    <dimen name="desktop_mode_handle_menu_shadow_radius">2dp</dimen>
+3 −6
Original line number Diff line number Diff line
@@ -40,13 +40,11 @@
        <item name="android:activityCloseExitAnimation">@anim/forced_resizable_exit</item>
    </style>

    <style name="DesktopModeHandleMenuActionButtonLayout">
    <style name="DesktopModeHandleMenuActionButton">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">52dp</item>
        <item name="android:layout_weight">1</item>
        <item name="android:gravity">start|center_vertical</item>
        <item name="android:paddingHorizontal">16dp</item>
        <item name="android:background">?android:selectableItemBackground</item>
        <item name="android:textColor">@androidprv:color/materialColorOnSurface</item>
        <item name="android:drawableTint">@androidprv:color/materialColorOnSurface</item>
    </style>

    <style name="DesktopModeHandleMenuActionButtonImage">
@@ -71,7 +69,6 @@
    <style name="DesktopModeHandleMenuWindowingButton">
        <item name="android:layout_width">48dp</item>
        <item name="android:layout_height">48dp</item>
        <item name="android:padding">14dp</item>
        <item name="android:scaleType">fitCenter</item>
        <item name="android:background">?android:selectableItemBackgroundBorderless</item>
    </style>
Loading