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

Commit 951b1578 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 90eddf1e 7933eadd

packages/SettingsLib/res/values/strings.xml

+5 −5
Original line number Diff line number Diff line
@@ -201,9 +201,9 @@ 
    <!-- Connected devices settings. Message when Bluetooth is connected and active, showing remote device status and battery level for untethered headset. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_active_battery_level_untethered">Active. L: <xliff:g id="battery_level_as_percentage" example="25%">%1$s</xliff:g>, R: <xliff:g id="battery_level_as_percentage" example="25%">%2$s</xliff:g> battery.</string>

    <!-- Connected devices settings. Message when Bluetooth is connected and active, showing remote device status and battery level for the left part of the untethered headset. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_active_battery_level_untethered_left">Active. L: <xliff:g id="battery_level_as_percentage" example="25%">%1$s</xliff:g> battery</string>

    <string name="bluetooth_active_battery_level_untethered_left">Active. L: <xliff:g id="battery_level_as_percentage" example="25%">%1$s</xliff:g> battery.</string>

    <!-- Connected devices settings. Message when Bluetooth is connected and active, showing remote device status and battery level  for the right part of the untethered headset. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_active_battery_level_untethered_right">Active. R: <xliff:g id="battery_level_as_percentage" example="25%">%1$s</xliff:g> battery</string>

    <string name="bluetooth_active_battery_level_untethered_right">Active. R: <xliff:g id="battery_level_as_percentage" example="25%">%1$s</xliff:g> battery.</string>

    <!-- Connected devices settings. Message when Bluetooth is connected but not in use, showing remote device battery level. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_battery_level"><xliff:g id="battery_level_as_percentage">%1$s</xliff:g> battery</string>

    <!-- Connected devices settings. Message on TV when Bluetooth is connected but not in use, showing remote device battery level. [CHAR LIMIT=NONE] -->
@@ -220,11 +220,11 @@ 
    <string name="bluetooth_saved_device">Saved</string>



    <!-- Connected device settings. Message when the left-side hearing aid device is active. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_hearing_aid_left_active">Active, left only</string>

    <string name="bluetooth_hearing_aid_left_active">Active (left only)</string>

    <!-- Connected device settings. Message when the right-side hearing aid device is active. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_hearing_aid_right_active">Active, right only</string>

    <string name="bluetooth_hearing_aid_right_active">Active (right only)</string>

    <!-- Connected device settings. Message when the left-side and right-side hearing aids device are active. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_hearing_aid_left_and_right_active">Active, left and right</string>

    <string name="bluetooth_hearing_aid_left_and_right_active">Active (left and right)</string>



    <!-- Connected devices settings. Message when Bluetooth is connected and active for media only, showing remote device status and battery level. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_active_media_only_battery_level">Active (media only). <xliff:g id="battery_level_as_percentage">%1$s</xliff:g> battery.</string>

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java

+8 −8
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ public class CachedBluetoothDeviceTest { 
        // Set device as Active for Hearing Aid and test connection state summary

        mCachedDevice.setHearingAidInfo(getLeftAshaHearingAidInfo());

        mCachedDevice.onActiveDeviceChanged(true, BluetoothProfile.HEARING_AID);

        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active, left only");

        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active (left only)");



        // Set Hearing Aid profile to be disconnected and test connection state summary

        mCachedDevice.onActiveDeviceChanged(false, BluetoothProfile.HEARING_AID);
@@ -717,7 +717,7 @@ public class CachedBluetoothDeviceTest { 
        mCachedDevice.setHearingAidInfo(getLeftAshaHearingAidInfo());

        mCachedDevice.onActiveDeviceChanged(true, BluetoothProfile.HEARING_AID);

        assertThat(mCachedDevice.getTvConnectionSummary().toString()).isEqualTo(

                "Active, left only");

                "Active (left only)");



        // Set Hearing Aid profile to be disconnected and test connection state summary

        mCachedDevice.onActiveDeviceChanged(false, BluetoothProfile.HEARING_AID);
@@ -794,7 +794,7 @@ public class CachedBluetoothDeviceTest { 


        // Act & Assert:

        //   Get "Active" result without Battery Level.

        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active, right only");

        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active (right only)");

    }



    @Test
@@ -810,7 +810,7 @@ public class CachedBluetoothDeviceTest { 
        // Act & Assert:

        //   Get "Active" result without Battery Level.

        assertThat(mCachedDevice.getTvConnectionSummary().toString()).isEqualTo(

                "Active, right only");

                "Active (right only)");

    }



    @Test
@@ -828,7 +828,7 @@ public class CachedBluetoothDeviceTest { 


        // Act & Assert:

        //   Get "Active" result without Battery Level.

        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active, left and right");

        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active (left and right)");

    }



    @Test
@@ -847,7 +847,7 @@ public class CachedBluetoothDeviceTest { 
        // Act & Assert:

        //   Get "Active" result without Battery Level.

        assertThat(mCachedDevice.getTvConnectionSummary().toString())

                .isEqualTo("Active, left and right");

                .isEqualTo("Active (left and right)");

    }



    @Test
@@ -894,7 +894,7 @@ public class CachedBluetoothDeviceTest { 
        // Set device as Active for LE Audio and test connection state summary

        mCachedDevice.setHearingAidInfo(getLeftLeAudioHearingAidInfo());

        mCachedDevice.onActiveDeviceChanged(true, BluetoothProfile.LE_AUDIO);

        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active, left only");

        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active (left only)");



        // Set LE Audio profile to be disconnected and test connection state summary

        mCachedDevice.onActiveDeviceChanged(false, BluetoothProfile.LE_AUDIO);
@@ -915,7 +915,7 @@ public class CachedBluetoothDeviceTest { 
        mCachedDevice.setHearingAidInfo(getLeftLeAudioHearingAidInfo());

        mCachedDevice.onActiveDeviceChanged(true, BluetoothProfile.LE_AUDIO);

        assertThat(mCachedDevice.getTvConnectionSummary().toString()).isEqualTo(

                "Active, left only");

                "Active (left only)");



        // Set LE Audio profile to be disconnected and test connection state summary

        mCachedDevice.onActiveDeviceChanged(false, BluetoothProfile.LE_AUDIO);