From 14a708a2ad42851856607378a65864cea434e850 Mon Sep 17 00:00:00 2001 From: Angela Wang Date: Wed, 24 Apr 2024 04:34:06 +0000 Subject: [PATCH] Update string resource for HA summary Update the message format to align with existing pattern. Bug: 333912856 Bug: 307705966 Test: atest AccessibilityHearingAidPreferenceControllerTest Change-Id: Ib8b38e6dc0df732c16f976911597076f6f92ed25 --- res/values/strings.xml | 6 +++--- ...bilityHearingAidPreferenceControllerTest.java | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 90cc39c9fad..2e796a29a85 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5292,11 +5292,11 @@ %1$s active - %1$s, left only + %1$s / Left only - %1$s, right only + %1$s / Right only - %1$s, left and right + %1$s / Left and right %1$s +1 more diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java index bb153783178..743f8843ced 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 @@ public class AccessibilityHearingAidPreferenceControllerTest { 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 @@ public class AccessibilityHearingAidPreferenceControllerTest { 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 @@ public class AccessibilityHearingAidPreferenceControllerTest { 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 @@ public class AccessibilityHearingAidPreferenceControllerTest { 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 @@ public class AccessibilityHearingAidPreferenceControllerTest { 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 @@ public class AccessibilityHearingAidPreferenceControllerTest { 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 @@ public class AccessibilityHearingAidPreferenceControllerTest { 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 @@ public class AccessibilityHearingAidPreferenceControllerTest { 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() {