From bc82228822c279353ff4a0a5bc37a9fbe44335d9 Mon Sep 17 00:00:00 2001 From: shaoweishen Date: Mon, 22 May 2023 10:21:58 +0000 Subject: [Output Switcher] Add Dock speaker string in SysUI Add and manage new string in SettingLib to support L18n. Bug: 279482922 Test: make -j64 RunSettingsLibRoboTests ROBOTEST_FILTER="com.android.settingslib.media.InfoMediaManagerTest" Change-Id: Ib24d0a401197e90629236b61920b442db5ac0d04 --- packages/SettingsLib/res/values/strings.xml | 6 ++++++ .../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 @@ This phone This tablet + + Dock speaker + + External Device + + Connected device This phone 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(); } -- cgit v1.2.3-59-g8ed1b