audio: Update microphone string
Screenshot: https://screenshot.googleplex.com/9gy2w9w2KMjQUa8
Bug: b/355684672
Test: manual (see screenshot above)
Flag: com.android.media.flags.enable_audio_input_device_routing_and_volume_control
Change-Id: Icdb4ef923f291c5fc5fe8cc818bfce558e415794
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index efc98db..8b9ec38 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -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] -->
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InputMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/InputMediaDevice.java
index dae69e6..e44a134 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/InputMediaDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/InputMediaDevice.java
@@ -98,14 +98,13 @@
@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();
}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputMediaDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputMediaDeviceTest.java
index 088d554..2f0aa1c 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputMediaDeviceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputMediaDeviceTest.java
@@ -76,7 +76,7 @@
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