From feb01cda9b90d751000734f3d0ce3e1f513396c2 Mon Sep 17 00:00:00 2001
From: Michael Mikhail <michaelmikhil@google.com>
Date: Tue, 31 Jan 2023 17:20:11 +0000
Subject: [PATCH] [a11y] update recommendation content discription for new
 layout

Content description for card should be the header and the media cover
items have the same content description of the old version.

Bug: 267295529
Test: Checked talkback and clicked on all ui components. Video
is in bug link.

Change-Id: If8d780220e01d10327f5f58ea6246e28ac8fb51a
---
 .../SystemUI/res/layout/media_recommendation_view.xml |  6 ++++--
 .../systemui/media/controls/ui/MediaControlPanel.java | 11 ++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/SystemUI/res/layout/media_recommendation_view.xml b/packages/SystemUI/res/layout/media_recommendation_view.xml
index b2aabc77a1dce..c54c4e48d13d4 100644
--- a/packages/SystemUI/res/layout/media_recommendation_view.xml
+++ b/packages/SystemUI/res/layout/media_recommendation_view.xml
@@ -47,7 +47,8 @@
         android:singleLine="true"
         android:textSize="12sp"
         android:gravity="top"
-        android:layout_gravity="bottom"/>
+        android:layout_gravity="bottom"
+        android:importantForAccessibility="no"/>
 
     <!-- Album name -->
     <TextView
@@ -61,7 +62,8 @@
         android:singleLine="true"
         android:textSize="11sp"
         android:gravity="center_vertical"
-        android:layout_gravity="bottom"/>
+        android:layout_gravity="bottom"
+        android:importantForAccessibility="no"/>
 
     <!-- Seek Bar -->
     <SeekBar
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java
index 901e2308744f2..0b4b668a04027 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java
@@ -734,9 +734,14 @@ public class MediaControlPanel {
             contentDescription =
                     mRecommendationViewHolder.getGutsViewHolder().getGutsText().getText();
         } else if (data != null) {
-            contentDescription = mContext.getString(
-                    R.string.controls_media_smartspace_rec_description,
-                    data.getAppName(mContext));
+            if (mFeatureFlags.isEnabled(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE)) {
+                contentDescription = mContext.getString(
+                        R.string.controls_media_smartspace_rec_header);
+            } else {
+                contentDescription = mContext.getString(
+                        R.string.controls_media_smartspace_rec_description,
+                        data.getAppName(mContext));
+            }
         } else {
             contentDescription = null;
         }