From d16be090869288f0a067597cc7d637f99693da2f Mon Sep 17 00:00:00 2001
From: Angela Wang <angelala@google.com>
Date: Thu, 20 Feb 2025 10:32:42 +0000
Subject: [PATCH] Set content description on ambien volume sliders

Added content descriptions to the UI component to improve accessibility for TalkBack users.

Flag: EXEMPT bugfix
Bug: 397134669
Test: manually test with TalkBack
Change-Id: If0c40d7b91061da5e100e49e71279adb6f69e77f
---
 res/values/strings.xml                                     | 6 ++++++
 .../settings/bluetooth/AmbientVolumePreference.java        | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a8963b2eecb..abbd0d38146 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -179,6 +179,12 @@
     <string name="bluetooth_ambient_volume_control_left">Left</string>
     <!-- Connected devices settings. The text to show the control is for right side device. [CHAR LIMIT=30] -->
     <string name="bluetooth_ambient_volume_control_right">Right</string>
+    <!-- Connected devices settings. Content description for unified ambient control slider. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ambient_volume_control_description">Surroundings</string>
+    <!-- Connected devices settings. Content description for left ambient control slider. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ambient_volume_control_left_description">Left surroundings</string>
+    <!-- Connected devices settings. Content description for right ambient control slider.. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_ambient_volume_control_right_description">Right surroundings</string>
     <!-- Connected devices settings. Content description for a button, that mute ambient volume [CHAR_LIMIT=NONE] -->
     <string name="bluetooth_ambient_volume_mute">Mute surroundings</string>
     <!-- Connected devices settings. Content description for a button, that unmute ambient volume [CHAR LIMIT=NONE] -->
diff --git a/src/com/android/settings/bluetooth/AmbientVolumePreference.java b/src/com/android/settings/bluetooth/AmbientVolumePreference.java
index 4f89007cf5f..86c8c94f22e 100644
--- a/src/com/android/settings/bluetooth/AmbientVolumePreference.java
+++ b/src/com/android/settings/bluetooth/AmbientVolumePreference.java
@@ -318,9 +318,16 @@ public class AmbientVolumePreference extends PreferenceGroup implements AmbientV
         if (side == SIDE_LEFT) {
             slider.setTitle(
                     getContext().getString(R.string.bluetooth_ambient_volume_control_left));
+            slider.setSliderContentDescription(getContext().getString(
+                    R.string.bluetooth_ambient_volume_control_left_description));
         } else if (side == SIDE_RIGHT) {
             slider.setTitle(
                     getContext().getString(R.string.bluetooth_ambient_volume_control_right));
+            slider.setSliderContentDescription(getContext().getString(
+                    R.string.bluetooth_ambient_volume_control_right_description));
+        } else {
+            slider.setSliderContentDescription(getContext().getString(
+                    R.string.bluetooth_ambient_volume_control_description));
         }
         mSideToSliderMap.put(side, slider);
     }