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." into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-09-15 08:17:15 +00:00
committed by Android (Google) Code Review
parent c21ad3649e 44cc57cd9d
commit eacabd567f
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(); final MediaDevice connectedDevice = worker.getCurrentConnectedMediaDevice();
if (devices.size() == 1) { if (devices.size() == 1) {
// Zero state // Zero state
for (MediaDevice device : devices) { final MediaDevice device = devices.iterator().next();
addRow(device, device, listBuilder); 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 { } else {
final boolean isTouched = worker.getIsTouched(); final boolean isTouched = worker.getIsTouched();
// Fix the last top device when user press device to transfer. // Fix the last top device when user press device to transfer.