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

Commit 29ab886b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update string for 3.5mm and usb audio device" into rvc-dev

parents b44d6d6d 1788910e

packages/SettingsLib/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -1376,4 +1376,7 @@ 


    <!-- A content description for work profile app [CHAR LIMIT=35] -->

    <string name="accessibility_work_profile_app_description">Work <xliff:g id="app_name" example="Camera">%s</xliff:g></string>



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

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

</resources>

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

+2 −2
Original line number Diff line number Diff line
@@ -61,11 +61,11 @@ public class PhoneMediaDevice extends MediaDevice { 
        switch (mRouteInfo.getType()) {

            case TYPE_WIRED_HEADSET:

            case TYPE_WIRED_HEADPHONES:

                name = mContext.getString(R.string.media_transfer_wired_device_name);

                break;

            case TYPE_USB_DEVICE:

            case TYPE_USB_HEADSET:

            case TYPE_USB_ACCESSORY:

                name = mContext.getString(R.string.media_transfer_wired_usb_device_name);

                break;

            case TYPE_DOCK:

            case TYPE_HDMI:

                name = mRouteInfo.getName();

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

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



        assertThat(mPhoneMediaDevice.getName())

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

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



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



        assertThat(mPhoneMediaDevice.getName())

                .isEqualTo(deviceName);

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



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