From 01ecf7624740fcb830c76073e5c8b0364fb79eae Mon Sep 17 00:00:00 2001
From: Yuchen Sun <kirain@google.com>
Date: Thu, 25 Jul 2024 06:40:26 +0000
Subject: [PATCH] Add content description to QR code image for talkback.

 - Rename string name for reuse purpose.

Test: Visual
Flag: EXEMPT bug fix
Bug: 350603175
Change-Id: Id5b1383c9cf1c2509a621bb9b225e0efeb58ca7f
---
 res/layout-land/bluetooth_audio_streams_qr_code.xml           | 2 +-
 res/layout/bluetooth_audio_streams_qr_code.xml                | 2 +-
 res/values/strings.xml                                        | 4 ++--
 .../settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java     | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/layout-land/bluetooth_audio_streams_qr_code.xml b/res/layout-land/bluetooth_audio_streams_qr_code.xml
index b35bc65f84f..17151979074 100644
--- a/res/layout-land/bluetooth_audio_streams_qr_code.xml
+++ b/res/layout-land/bluetooth_audio_streams_qr_code.xml
@@ -48,7 +48,7 @@
             android:id="@+id/qrcode_view"
             android:layout_width="@dimen/qrcode_size"
             android:layout_height="@dimen/qrcode_size"
-            android:contentDescription="@string/audio_streams_qr_code_page_image_label"
+            android:contentDescription="@string/qr_code_content_description"
             android:focusable="true" />
 
         <TextView
diff --git a/res/layout/bluetooth_audio_streams_qr_code.xml b/res/layout/bluetooth_audio_streams_qr_code.xml
index fd521febc4a..ae2d4e0764b 100644
--- a/res/layout/bluetooth_audio_streams_qr_code.xml
+++ b/res/layout/bluetooth_audio_streams_qr_code.xml
@@ -48,7 +48,7 @@
                 android:id="@+id/qrcode_view"
                 android:layout_width="@dimen/qrcode_size"
                 android:layout_height="@dimen/qrcode_size"
-                android:contentDescription="@string/audio_streams_qr_code_page_image_label"
+                android:contentDescription="@string/qr_code_content_description"
                 android:focusable="true"/>
 
             <TextView
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 454ec613427..5fa003176ed 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -78,6 +78,8 @@
 
     <!-- Content description for preview pager. [CHAR LIMIT=NONE] -->
     <string name="preview_pager_content_description">Preview</string>
+    <!-- Content description for qrcode image. [CHAR LIMIT=none]-->
+    <string name="qr_code_content_description">QR code</string>
 
     <!-- Description for the button that makes interface elements smaller. [CHAR_LIMIT=NONE] -->
     <string name="font_size_make_smaller_desc">Make smaller</string>
@@ -13760,8 +13762,6 @@
     <string name="audio_streams_main_page_qr_code_scanner_summary">Scan an audio stream QR code to listen with <xliff:g example="LE headset" id="device_name">%1$s</xliff:g></string>
     <!-- Le audio streams password dialog  [CHAR LIMIT=NONE] -->
     <string name="audio_streams_main_page_password_dialog_cannot_edit">Can\u0027t edit password while sharing. To change the password, first turn off audio sharing.</string>
-    <!-- Text for audio sharing qrcode image [CHAR LIMIT=none]-->
-    <string name="audio_streams_qr_code_page_image_label">QR code</string>
     <!-- Text for audio sharing qrcode scanner [CHAR LIMIT=none]-->
     <string name="audio_streams_qr_code_scanner_label">QR code scanner</string>
 
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
index 42a74dddc7f..40cf24d52eb 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
@@ -114,6 +114,7 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment {
         super.onViewCreated(view, savedInstanceState);
 
         mQrCodeView = view.findViewById(R.id.qrcode_view);
+        mQrCodeView.setContentDescription(getString(R.string.qr_code_content_description));
 
         final WifiNetworkConfig wifiNetworkConfig = getWifiNetworkConfigFromHostActivity();
         if (wifiNetworkConfig.isHotspot()) {