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

Merge "[Output Switcher] Modify checking for device isConnected" into tm-dev

Browse Source
This commit is contained in:
Shaowei Shen
2022-03-31 01:37:17 +00:00
committed by Android (Google) Code Review
parent a5fdb746cf d08d997838
commit 34e3f0ad26
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java
View File

@@ -20,7 +20,6 @@ import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
@@ -231,15 +230,6 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
}
}
private boolean isDeviceIncluded(List<MediaDevice> deviceList, MediaDevice targetDevice) {
for (MediaDevice device : deviceList) {
if (TextUtils.equals(device.getId(), targetDevice.getId())) {
return true;
}
}
return false;
}
private void onItemClick(View view, MediaDevice device) {
if (mController.isTransferring()) {
return;

15
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java
View File

@@ -46,6 +46,8 @@ import com.android.settingslib.utils.ThreadUtils;
import com.android.systemui.R;
import com.android.systemui.animation.Interpolators;
import java.util.List;
/**
* Base adapter for media output dialog.
*/
@@ -94,7 +96,18 @@ public abstract class MediaOutputBaseAdapter extends
boolean isCurrentlyConnected(MediaDevice device) {
return TextUtils.equals(device.getId(),
mController.getCurrentConnectedMediaDevice().getId());
mController.getCurrentConnectedMediaDevice().getId())
|| (mController.getSelectedMediaDevice().size() == 1
&& isDeviceIncluded(mController.getSelectedMediaDevice(), device));
}
boolean isDeviceIncluded(List<MediaDevice> deviceList, MediaDevice targetDevice) {
for (MediaDevice device : deviceList) {
if (TextUtils.equals(device.getId(), targetDevice.getId())) {
return true;
}
}
return false;
}
boolean isDragging() {