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

Commit e4168e79 authored by mattsziklay's avatar mattsziklay
Browse files

Add content description resource for Manage Windows icon. 

Bug: 337917761
Test: Manual
Flag: com.android.window.flags.enable_desktop_windowing_multi_instance_features
Change-Id: Icf50d05a50d6c4bee8738b8774e0d944830a2744
parent 94bf7a71

libs/WindowManager/Shell/shared/res/values/strings.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.

-->

<resources>

  <!-- Accessibility text for the icons generated by the Manage Windows submenu

  in desktop mode and taskbar. [CHAR LIMIT=NONE] -->

  <string name="manage_windows_icon_text">Open Window %1$d</string>

</resources>

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/ManageWindowsViewContainer.kt→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/multiinstance/ManageWindowsViewContainer.kt

+13 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.shared.desktopmode

package com.android.wm.shell.shared.multiinstance

import android.animation.Animator

import android.animation.AnimatorListenerAdapter

import android.animation.AnimatorSet
@@ -34,6 +34,7 @@ import android.view.View.SCALE_Y 
import android.view.ViewGroup.MarginLayoutParams

import android.widget.LinearLayout

import android.window.TaskSnapshot

import com.android.wm.shell.shared.R



/**

 * View for the All Windows menu option, used by both Desktop Windowing and Taskbar.
@@ -167,6 +168,9 @@ abstract class ManageWindowsViewContainer( 
                val appSnapshotButton = SurfaceView(context)

                appSnapshotButton.cornerRadius = iconRadius

                appSnapshotButton.setZOrderOnTop(true)

                appSnapshotButton.contentDescription = context.resources.getString(

                    R.string.manage_windows_icon_text, iconCount + 1

                )

                appSnapshotButton.setOnClickListener {

                    onIconClickListener?.invoke(taskId)

                }
@@ -230,10 +234,12 @@ abstract class ManageWindowsViewContainer( 
        /** Play the animation for opening the menu. */

        fun animateOpen() {

            animateView(rootView, MENU_BOUNDS_SHRUNK_SCALE, MENU_BOUNDS_FULL_SCALE,

                MENU_START_ALPHA, MENU_FULL_ALPHA)

                MENU_START_ALPHA, MENU_FULL_ALPHA

            )

            for (view in iconViews) {

                animateView(view, MENU_BOUNDS_SHRUNK_SCALE, MENU_BOUNDS_FULL_SCALE,

                    MENU_START_ALPHA, MENU_FULL_ALPHA)

                    MENU_START_ALPHA, MENU_FULL_ALPHA

                )

            }

            createAnimatorSet().start()

        }
@@ -241,10 +247,12 @@ abstract class ManageWindowsViewContainer( 
        /** Play the animation for closing the menu. */

        fun animateClose(callback: () -> Unit) {

            animateView(rootView, MENU_BOUNDS_FULL_SCALE, MENU_BOUNDS_SHRUNK_SCALE,

                MENU_FULL_ALPHA, MENU_START_ALPHA)

                MENU_FULL_ALPHA, MENU_START_ALPHA

            )

            for (view in iconViews) {

                animateView(view, MENU_BOUNDS_FULL_SCALE, MENU_BOUNDS_SHRUNK_SCALE,

                    MENU_FULL_ALPHA, MENU_START_ALPHA)

                    MENU_FULL_ALPHA, MENU_START_ALPHA

                )

            }

            createAnimatorSet().apply {

                addListener(

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopHandleManageWindowsMenu.kt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.view.WindowManager 
import android.window.TaskSnapshot

import androidx.compose.ui.graphics.toArgb

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus

import com.android.wm.shell.shared.desktopmode.ManageWindowsViewContainer

import com.android.wm.shell.shared.multiinstance.ManageWindowsViewContainer

import com.android.wm.shell.shared.split.SplitScreenConstants

import com.android.wm.shell.splitscreen.SplitScreenController

import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalSystemViewContainer

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopHeaderManageWindowsMenu.kt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import com.android.window.flags.Flags 
import com.android.wm.shell.RootTaskDisplayAreaOrganizer

import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.desktopmode.DesktopRepository

import com.android.wm.shell.shared.desktopmode.ManageWindowsViewContainer

import com.android.wm.shell.shared.multiinstance.ManageWindowsViewContainer

import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalSystemViewContainer

import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalViewContainer

import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalViewHostViewContainer

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import static com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.Indica 
import static com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.IndicatorType.TO_SPLIT_LEFT_INDICATOR;

import static com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.IndicatorType.TO_SPLIT_RIGHT_INDICATOR;

import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE;

import static com.android.wm.shell.shared.desktopmode.ManageWindowsViewContainer.MANAGE_WINDOWS_MINIMUM_INSTANCES;

import static com.android.wm.shell.shared.multiinstance.ManageWindowsViewContainer.MANAGE_WINDOWS_MINIMUM_INSTANCES;

import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT;

import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT;

import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED;