diff options
| author | 2023-05-26 10:15:04 +0000 | |
|---|---|---|
| committer | 2023-05-26 10:15:04 +0000 | |
| commit | f96266ec08f8f5ed967e1478cc8a071c829e9028 (patch) | |
| tree | 74845bdcb078f2ea595348c1851d5c29cbabd01a | |
| parent | 741afeca21df3fcda736e41e32559fdd65dfca69 (diff) | |
| parent | bc82228822c279353ff4a0a5bc37a9fbe44335d9 (diff) | |
Merge "[Output Switcher] Add Dock speaker string in SysUI" into udc-dev
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 6 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index f581091f0f3e..dac7f8d15388 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1327,6 +1327,12 @@ <string name="media_transfer_this_device_name" product="default">This phone</string> <!-- Name of the tablet device. [CHAR LIMIT=30] --> <string name="media_transfer_this_device_name" product="tablet">This tablet</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] --> + <string name="media_transfer_external_device_name">External Device</string> + <!-- Default name of the connected device. [CHAR LIMIT=30] --> + <string name="media_transfer_default_device_name">Connected device</string> <!-- Name of the phone device with an active remote session. [CHAR LIMIT=30] --> <string name="media_transfer_this_phone">This phone</string> <!-- Sub status indicates device is not available due to an unknown error. [CHAR LIMIT=NONE] --> diff --git a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java index 1c82be9c801f..34519c993d27 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java @@ -70,13 +70,17 @@ public class PhoneMediaDevice extends MediaDevice { name = mContext.getString(R.string.media_transfer_wired_usb_device_name); break; case TYPE_DOCK: - case TYPE_HDMI: - name = mRouteInfo.getName(); + name = mContext.getString(R.string.media_transfer_dock_speaker_device_name); break; case TYPE_BUILTIN_SPEAKER: - default: name = mContext.getString(R.string.media_transfer_this_device_name); break; + case TYPE_HDMI: + name = mContext.getString(R.string.media_transfer_external_device_name); + break; + default: + name = mContext.getString(R.string.media_transfer_default_device_name); + break; } return name.toString(); } |