diff options
| author | 2024-09-18 16:42:47 +0000 | |
|---|---|---|
| committer | 2024-09-18 16:42:47 +0000 | |
| commit | 95b0e20bbe646446e3552661a1482938a26c3a2d (patch) | |
| tree | 60f06e5d16bcd8b1c429a9e393674f9785f0054e | |
| parent | 51aaeeb4c8471ae604811c640f0fa7a747c12146 (diff) | |
| parent | 6122602971c40651f2a88b9cf11d21a81421e55f (diff) | |
Merge "Rename media_transfer_wired_usb_device_name" into main
3 files changed, 5 insertions, 5 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 0b094a2f70e2..34e33c0df8f5 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -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> diff --git a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java index 116de567a7da..0b8fb22cef3a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java @@ -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); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/PhoneMediaDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/PhoneMediaDeviceTest.java index 23cfc01b07b8..da5f428ce23b 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/PhoneMediaDeviceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/PhoneMediaDeviceTest.java @@ -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); |