Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93f4595b authored by Angela Wang's avatar Angela Wang Committed by Android (Google) Code Review
Browse files

Merge "Update string resource for HA summary" into main

parents c593355c 14a708a2

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -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

+8 −8
Original line number Diff line number Diff line
@@ -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() {