diff options
| author | 2023-05-26 11:23:20 +0000 | |
|---|---|---|
| committer | 2023-05-26 11:23:20 +0000 | |
| commit | b4a01a44a9b76fab79ba73c0a8d038e0e469d89d (patch) | |
| tree | 830bda729a5bba7ee63645dabd53c4a0bcc99faf | |
| parent | 9eaf436e40b202c9a2434601969436c96e8493e1 (diff) | |
| parent | 270d7f74edf70f5a799c80eecc3456f7cc9abc7c (diff) | |
Merge "[Output Switcher] Add Dock speaker string in SysUI" into udc-dev am: f96266ec08 am: 270d7f74ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23358305
Change-Id: I2b7ca7cd96705aaaf5faf539a6c5fc83400d03ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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(); } |