PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Display "pair new" only when local output device is available." am: e581cab958

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343227

Change-Id: I3c9c1ca8320b9f8367fcd9bdfd4671b12e28e787
This commit is contained in:
tim peng
2020-08-12 03:18:28 +00:00
committed by Automerger Merge Worker
parent 5146b84076 e581cab958
commit c8f033e82d
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/media/MediaOutputSlice.java
View File

@@ -106,10 +106,15 @@ public class MediaOutputSlice implements CustomSliceable {
final MediaDevice connectedDevice = worker.getCurrentConnectedMediaDevice();
if (devices.size() == 1) {
// Zero state
for (MediaDevice device : devices) {
addRow(device, device, listBuilder);
final MediaDevice device = devices.iterator().next();
addRow(device, device, listBuilder);
// Add "pair new" only when local output device exists
final int type = device.getDeviceType();
if (type == MediaDevice.MediaDeviceType.TYPE_PHONE_DEVICE
|| type == MediaDevice.MediaDeviceType.TYPE_3POINT5_MM_AUDIO_DEVICE
|| type == MediaDevice.MediaDeviceType.TYPE_USB_C_AUDIO_DEVICE) {
listBuilder.addRow(getPairNewRow());
}
listBuilder.addRow(getPairNewRow());
} else {
final boolean isTouched = worker.getIsTouched();
// Fix the last top device when user press device to transfer.