Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72d6585f authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Modify checking for device isConnected" into tm-dev am: 34e3f0ad 

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



Change-Id: Idda0744df3145f2359c1bc4d91dfaa42e5e6572c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 263086bb 34e3f0ad

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

+0 −10
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.res.ColorStateList; 
import android.graphics.PorterDuff;

import android.graphics.PorterDuff;

import android.graphics.PorterDuffColorFilter;

import android.graphics.PorterDuffColorFilter;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.text.TextUtils;

import android.util.Log;

import android.util.Log;

import android.view.View;

import android.view.View;

import android.view.ViewGroup;

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) {

        private void onItemClick(View view, MediaDevice device) {

            if (mController.isTransferring()) {

            if (mController.isTransferring()) {

                return;

                return;

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

+14 −1
Original line number Original line Diff line number Diff line
@@ -46,6 +46,8 @@ import com.android.settingslib.utils.ThreadUtils; 
import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.animation.Interpolators;

import com.android.systemui.animation.Interpolators;





import java.util.List;



/**

/**

 * Base adapter for media output dialog.

 * Base adapter for media output dialog.

 */

 */
@@ -94,7 +96,18 @@ public abstract class MediaOutputBaseAdapter extends 




    boolean isCurrentlyConnected(MediaDevice device) {

    boolean isCurrentlyConnected(MediaDevice device) {

        return TextUtils.equals(device.getId(),

        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() {

    boolean isDragging() {