Merge "[Output Switcher] Modify checking for device isConnected" into tm-dev (34e3f0ad) · Commits · e / os / android_frameworks_base

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -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;

+14 −1

Original line number	Diff line number	Diff line
		@@ -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() {