commit 93f4595b4ece7d485991e936ce81d53ddc0785ec
author Angela Wang <angelala@google.com> Thu Apr 25 12:11:26 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 25 12:11:26 2024 +0000
tree 11c82379cbea5b6c82968331d41900b8632c2d5c
parent c593355c1e3b284fdd01d3b83fda043270696db0
parent 14a708a2ad42851856607378a65864cea434e850

Merge "Update string resource for HA summary" into main

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 90cc39c..2e796a2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5292,11 +5292,11 @@
     <!-- Summary for the accessibility preference for hearing aid when there is an active device. [CHAR LIMIT=50] -->
     <string name="accessibility_hearingaid_active_device_summary"><xliff:g id="device_name"  example="GN Hearing Aids">%1$s</xliff:g> active</string>
     <!-- Summary for the accessibility preference for hearing aid when there is only left side active. [CHAR LIMIT=50] -->
-    <string name="accessibility_hearingaid_left_side_device_summary"><xliff:g id="device_name"  example="GN Hearing Aids">%1$s</xliff:g>, left only</string>
+    <string name="accessibility_hearingaid_left_side_device_summary"><xliff:g id="device_name"  example="GN Hearing Aids">%1$s</xliff:g> / Left only</string>
     <!-- Summary for the accessibility preference for hearing aid when there is only right side active. [CHAR LIMIT=50] -->
-    <string name="accessibility_hearingaid_right_side_device_summary"><xliff:g id="device_name"  example="GN Hearing Aids">%1$s</xliff:g>, right only</string>
+    <string name="accessibility_hearingaid_right_side_device_summary"><xliff:g id="device_name"  example="GN Hearing Aids">%1$s</xliff:g> / Right only</string>
     <!-- Summary for the accessibility preference for hearing aid when both left side and right side are active. [CHAR LIMIT=50] -->
-    <string name="accessibility_hearingaid_left_and_right_side_device_summary"><xliff:g id="device_name"  example="GN Hearing Aids">%1$s</xliff:g>, left and right</string>
+    <string name="accessibility_hearingaid_left_and_right_side_device_summary"><xliff:g id="device_name"  example="GN Hearing Aids">%1$s</xliff:g> / Left and right</string>
     <!-- Summary for the accessibility preference for hearing aid when there are more than one set of devices are active. [CHAR LIMIT=50] -->
     <string name="accessibility_hearingaid_more_device_summary"><xliff:g id="device_name" example="GN Hearing Aids">%1$s</xliff:g> +1 more</string>
     <!-- Title for the hearing device pairing preference. [CHAR LIMIT=20] -->

tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
index bb15378..743f884 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
@@ -134,7 +134,7 @@
         sendIntent(intent);
 
         assertThat(mHearingAidPreference.getSummary().toString().contentEquals(
-                "TEST_HEARING_AID_BT_DEVICE_NAME, right only")).isTrue();
+                "TEST_HEARING_AID_BT_DEVICE_NAME / Right only")).isTrue();
     }
 
     @Test
@@ -151,7 +151,7 @@
         sendIntent(intent);
 
         assertThat(mHearingAidPreference.getSummary().toString().contentEquals(
-                "TEST_HEARING_AID_BT_DEVICE_NAME, left and right")).isTrue();
+                "TEST_HEARING_AID_BT_DEVICE_NAME / Left and right")).isTrue();
     }
 
     @Test
@@ -167,7 +167,7 @@
         sendIntent(intent);
 
         assertThat(mHearingAidPreference.getSummary().toString().contentEquals(
-                "TEST_HEARING_AID_BT_DEVICE_NAME, left only")).isTrue();
+                "TEST_HEARING_AID_BT_DEVICE_NAME / Left only")).isTrue();
     }
 
     @Test
@@ -183,7 +183,7 @@
         sendIntent(intent);
 
         assertThat(mHearingAidPreference.getSummary().toString().contentEquals(
-                "TEST_HEARING_AID_BT_DEVICE_NAME, right only")).isTrue();
+                "TEST_HEARING_AID_BT_DEVICE_NAME / Right only")).isTrue();
     }
 
     @Test
@@ -199,7 +199,7 @@
         sendIntent(intent);
 
         assertThat(mHearingAidPreference.getSummary().toString().contentEquals(
-                "TEST_HEARING_AID_BT_DEVICE_NAME, left and right")).isTrue();
+                "TEST_HEARING_AID_BT_DEVICE_NAME / Left and right")).isTrue();
     }
 
     @Test
@@ -214,7 +214,7 @@
         sendIntent(intent);
 
         assertThat(mHearingAidPreference.getSummary().toString()).isEqualTo(
-                "TEST_HEARING_AID_BT_DEVICE_NAME, left and right");
+                "TEST_HEARING_AID_BT_DEVICE_NAME / Left and right");
     }
 
     @Test
@@ -254,7 +254,7 @@
         mPreferenceController.onServiceConnected();
 
         assertThat(mHearingAidPreference.getSummary().toString()).isEqualTo(
-                "TEST_HEARING_AID_BT_DEVICE_NAME, left only");
+                "TEST_HEARING_AID_BT_DEVICE_NAME / Left only");
     }
 
     @Test
@@ -267,7 +267,7 @@
         mPreferenceController.onServiceConnected();
 
         assertThat(mHearingAidPreference.getSummary().toString()).isEqualTo(
-                "TEST_HEARING_AID_BT_DEVICE_NAME, right only");
+                "TEST_HEARING_AID_BT_DEVICE_NAME / Right only");
     }
 
     private void setupEnvironment() {