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

Commit 95b0e20b authored by Wenyu Zhang's avatar Wenyu Zhang Committed by Android (Google) Code Review
Browse files

Merge "Rename media_transfer_wired_usb_device_name" into main

parents 51aaeeb4 61226029

packages/SettingsLib/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1639,7 +1639,7 @@ 
    <string name="cached_apps_freezer_reboot_dialog_text">Your device must be rebooted for this change to apply. Reboot now or cancel.</string>



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

    <string name="media_transfer_wired_usb_device_name">Wired headphone</string>

    <string name="media_transfer_wired_headphone_name">Wired headphone</string>



    <!-- Name of the 3.5mm headphone, used in desktop devices. [CHAR LIMIT=50] -->

    <string name="media_transfer_headphone_name">Headphone</string>

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

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class PhoneMediaDevice extends MediaDevice { 
                name =

                        inputRoutingEnabledAndIsDesktop()

                                ? context.getString(R.string.media_transfer_headphone_name)

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

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

                break;

            case TYPE_USB_DEVICE:

            case TYPE_USB_HEADSET:
@@ -98,7 +98,7 @@ public class PhoneMediaDevice extends MediaDevice { 
                name =

                        inputRoutingEnabledAndIsDesktop()

                                ? context.getString(R.string.media_transfer_usb_speaker_name)

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

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

                break;

            case TYPE_DOCK:

                name = context.getString(R.string.media_transfer_dock_speaker_device_name);

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

+2 −2
Original line number Diff line number Diff line
@@ -106,12 +106,12 @@ public class PhoneMediaDeviceTest { 
        when(mInfo.getName()).thenReturn(deviceName);



        assertThat(mPhoneMediaDevice.getName())

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

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



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



        assertThat(mPhoneMediaDevice.getName())

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

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



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