From 95e590229abdad9295b057e2ef7232bc02d3fdb5 Mon Sep 17 00:00:00 2001
From: vinayjoglekar <vinayjoglekar@google.com>
Date: Mon, 12 Aug 2024 16:03:12 +0100
Subject: [PATCH] =?UTF-8?q?Announce=20=E2=80=9CDesktop=E2=80=9D=20when=20f?=
 =?UTF-8?q?ocusing=20on=20the=20desktop=20mode=20in=20Overview?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://drive.google.com/file/d/1MNUyDtRhyU8tKRZ5JONLAeUBQ_8Vrids/view?usp=drive_link

Test: NA
BUG: 329375034
Flag: com.android.window.flags.enable_desktop_windowing_mode
Change-Id: I36460002be94697746fb085e4aeca9a6ac804002
---
 quickstep/res/layout/task_desktop.xml          | 18 ++++++++----------
 quickstep/res/values/strings.xml               |  5 ++++-
 .../android/quickstep/views/DesktopTaskView.kt |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/quickstep/res/layout/task_desktop.xml b/quickstep/res/layout/task_desktop.xml
index 8c7090e41a..1564653733 100644
--- a/quickstep/res/layout/task_desktop.xml
+++ b/quickstep/res/layout/task_desktop.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?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");
@@ -15,20 +14,19 @@
      limitations under the License.
 -->
 
-<com.android.quickstep.views.DesktopTaskView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+<com.android.quickstep.views.DesktopTaskView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:id="@+id/task_view_desktop"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipChildren="true"
+    android:clipToPadding="true"
+    android:contentDescription="@string/recent_task_desktop"
     android:defaultFocusHighlightEnabled="false"
     android:focusable="true"
+    android:padding="0.1dp"
     launcher:focusBorderColor="?attr/materialColorOutline"
-    launcher:hoverBorderColor="?attr/materialColorPrimary"
-    android:clipToPadding="true"
-    android:padding="0.1dp">
+    launcher:hoverBorderColor="?attr/materialColorPrimary">
     <!-- Setting a padding of 0.1 dp since android:clipToPadding needs a non-zero value for
     padding to work-->
     <View
@@ -38,8 +36,8 @@
 
     <ViewStub
         android:id="@+id/icon"
-        android:inflatedId="@id/icon"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content" />
+        android:inflatedId="@id/icon" />
 
 </com.android.quickstep.views.DesktopTaskView>
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 037a0f6d72..d0f474ff04 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -26,9 +26,12 @@
     <string name="recent_task_option_pin">Pin</string>
     <!-- Title for an option to enter freeform mode for a given app -->
     <string name="recent_task_option_freeform">Freeform</string>
-    <!-- Title for an option to enter desktop windowing mode for a given app -->
+    <!-- Title and content description for an option to enter desktop windowing mode for a given app -->
     <string name="recent_task_option_desktop">Desktop</string>
 
+    <!-- Title and content description for Desktop tile in Recents screen that contains apps opened inside desktop windowing mode [CHAR LIMIT=NONE] -->
+    <string name="recent_task_desktop">Desktop</string>
+
     <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
     <string name="recents_empty_message">No recent items</string>
 
diff --git a/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt b/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt
index aa628f83cf..e242dfd7c6 100644
--- a/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt
+++ b/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt
@@ -94,7 +94,7 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu
                         context.theme
                     )
                 )
-                setText(resources.getText(R.string.recent_task_option_desktop))
+                setText(resources.getText(R.string.recent_task_desktop))
             }
         childCountAtInflation = childCount
     }