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

Commit 4fb09dbd authored by Longbo Wei's avatar Longbo Wei Committed by Android (Google) Code Review
Browse files

Merge "Audio: Update the strings for USB input/output devices." into main

parents 4c3c4bfc e314e310

packages/SettingsLib/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -1645,13 +1645,13 @@ 
    <string name="media_transfer_headphone_name">Headphone</string>



    <!-- Name of the usb audio device speaker, used in desktop devices. [CHAR LIMIT=50] -->

    <string name="media_transfer_usb_speaker_name">USB speaker</string>

    <string name="media_transfer_usb_audio_name">USB audio</string>



    <!-- Name of the 3.5mm audio device mic. [CHAR LIMIT=50] -->

    <string name="media_transfer_wired_device_mic_name">Mic jack</string>



    <!-- Name of the usb audio device mic. [CHAR LIMIT=50] -->

    <string name="media_transfer_usb_device_mic_name">USB mic</string>

    <string name="media_transfer_usb_device_mic_name">USB microphone</string>



    <!-- Label for Wifi hotspot switch on. Toggles hotspot on [CHAR LIMIT=30] -->

    <string name="wifi_hotspot_switch_on_text">On</string>

packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class PhoneMediaDevice extends MediaDevice { 
            case TYPE_USB_ACCESSORY:

                name =

                        inputRoutingEnabledAndIsDesktop()

                                ? context.getString(R.string.media_transfer_usb_speaker_name)

                                ? context.getString(R.string.media_transfer_usb_audio_name)

                                : context.getString(R.string.media_transfer_wired_headphone_name);

                break;

            case TYPE_DOCK:

packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/PhoneMediaDeviceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public class PhoneMediaDeviceTest { 
        when(mInfo.getType()).thenReturn(TYPE_USB_DEVICE);



        assertThat(mPhoneMediaDevice.getName())

                .isEqualTo(mContext.getString(R.string.media_transfer_usb_speaker_name));

                .isEqualTo(mContext.getString(R.string.media_transfer_usb_audio_name));



        when(mInfo.getType()).thenReturn(TYPE_BUILTIN_SPEAKER);