Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Output Switcher] Add Dock speaker string in SysUI" into udc-dev am: f96266ec08

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23358305

Change-Id: I417e1cd7ee1333bd4da163ac9743d1cbfdc27157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shaowei Shen
2023-05-26 10:36:35 +00:00
committed by Automerger Merge Worker
parent 484fac3716 f96266ec08
commit 270d7f74ed
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/res/values/strings.xml
View File

@@ -1327,6 +1327,12 @@
<string name="media_transfer_this_device_name" product="default">This phone</string> <string name="media_transfer_this_device_name" product="default">This phone</string>
<!-- Name of the tablet device. [CHAR LIMIT=30] --> <!-- Name of the tablet device. [CHAR LIMIT=30] -->
<string name="media_transfer_this_device_name" product="tablet">This tablet</string> <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] --> <!-- Name of the phone device with an active remote session. [CHAR LIMIT=30] -->
<string name="media_transfer_this_phone">This phone</string> <string name="media_transfer_this_phone">This phone</string>
<!-- Sub status indicates device is not available due to an unknown error. [CHAR LIMIT=NONE] --> <!-- Sub status indicates device is not available due to an unknown error. [CHAR LIMIT=NONE] -->

10
packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java
View File

@@ -70,13 +70,17 @@ public class PhoneMediaDevice extends MediaDevice {
name = mContext.getString(R.string.media_transfer_wired_usb_device_name); name = mContext.getString(R.string.media_transfer_wired_usb_device_name);
break; break;
case TYPE_DOCK: case TYPE_DOCK:
case TYPE_HDMI: name = mContext.getString(R.string.media_transfer_dock_speaker_device_name);
name = mRouteInfo.getName();
break; break;
case TYPE_BUILTIN_SPEAKER: case TYPE_BUILTIN_SPEAKER:
default:
name = mContext.getString(R.string.media_transfer_this_device_name); name = mContext.getString(R.string.media_transfer_this_device_name);
break; 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(); return name.toString();
} }