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

Commit a823dd54 authored by Camden Bickel's avatar Camden Bickel Committed by Android (Google) Code Review
Browse files

Merge "audio: Update microphone string" into main

parents ff11eeb0 5f6a21cd

packages/SettingsLib/res/values/strings.xml

+1 −3
Original line number Diff line number Diff line
@@ -1409,12 +1409,10 @@ 
    <string name="media_transfer_this_device_name">This phone</string>

    <!-- Name of the tablet device. [CHAR LIMIT=30] -->

    <string name="media_transfer_this_device_name_tablet">This tablet</string>

    <!-- Name of the internal speaker. [CHAR LIMIT=30] -->

    <!-- Name of the internal speaker and mic. [CHAR LIMIT=30] -->

    <string name="media_transfer_this_device_name_desktop">This computer (internal)</string>

    <!-- Name of the default media output of the TV. [CHAR LIMIT=30] -->

    <string name="media_transfer_this_device_name_tv">@string/tv_media_transfer_default</string>

    <!-- Name of the internal mic. [CHAR LIMIT=30] -->

    <string name="media_transfer_internal_mic">Microphone (internal)</string>

    <!-- Name of the dock device. [CHAR LIMIT=30] -->

    <string name="media_transfer_dock_speaker_device_name">Dock speaker</string>

    <!-- Default name of the external device. [CHAR LIMIT=30] -->

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

+7 −8
Original line number Diff line number Diff line
@@ -98,13 +98,12 @@ public class InputMediaDevice extends MediaDevice { 


    @Override

    public @NonNull String getName() {

        CharSequence name =

                switch (mAudioDeviceInfoType) {

                    case TYPE_WIRED_HEADSET ->

                            mContext.getString(R.string.media_transfer_wired_device_mic_name);

                    case TYPE_USB_DEVICE, TYPE_USB_HEADSET, TYPE_USB_ACCESSORY ->

                            mContext.getString(R.string.media_transfer_usb_device_mic_name);

                    default -> mContext.getString(R.string.media_transfer_internal_mic);

        CharSequence name = switch (mAudioDeviceInfoType) {

            case TYPE_WIRED_HEADSET -> mContext.getString(

                    R.string.media_transfer_wired_device_mic_name);

            case TYPE_USB_DEVICE, TYPE_USB_HEADSET, TYPE_USB_ACCESSORY -> mContext.getString(

                    R.string.media_transfer_usb_device_mic_name);

            default -> mContext.getString(R.string.media_transfer_this_device_name_desktop);

        };

        return name.toString();

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class InputMediaDeviceTest { 
                        IS_VOLUME_FIXED);

        assertThat(builtinMediaDevice).isNotNull();

        assertThat(builtinMediaDevice.getName())

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

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

    }



    @Test