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

Commit 01b6599e authored by Alex Shabalin's avatar Alex Shabalin
Browse files

Turn around the inheritance dependency for MediaOutputAdapter classes. 

- Rename `MediaOutputAdapter` to `MediaOutputAdapterBase`.
- Rename `MediaOutputBaseAdapter` to `MediaOutputAdapterLegacy`.
- Make `MediaOutputAdapterLegacy` a child of `MediaOutputAdapterBase`.

Flag: EXEMPT refactor
Bug: 387570618
Fix: 387570618
Test: atest SystemUiRoboTests:MediaOutputAdapterLegacyTest
Change-Id: Ic8ef1856ad2fd27252918fbb7f113079399dcd11
parent d400329e

packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacyTest.java

+43 −41
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ import java.util.stream.Collectors; 
@SmallTest

@RunWith(AndroidJUnit4.class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

public class MediaOutputAdapterTest extends SysuiTestCase {

public class MediaOutputAdapterLegacyTest extends SysuiTestCase {



    private static final String TEST_DEVICE_NAME_1 = "test_device_name_1";

    private static final String TEST_DEVICE_NAME_2 = "test_device_name_2";
@@ -90,8 +90,8 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 


    @Captor

    private ArgumentCaptor<SeekBar.OnSeekBarChangeListener> mOnSeekBarChangeListenerCaptor;

    private MediaOutputAdapter mMediaOutputAdapter;

    private MediaOutputAdapter.MediaDeviceViewHolder mViewHolder;

    private MediaOutputAdapterLegacy mMediaOutputAdapter;

    private MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy mViewHolder;

    private List<MediaDevice> mMediaDevices = new ArrayList<>();

    private List<MediaItem> mMediaItems = new ArrayList<>();

    MediaOutputSeekbar mSpyMediaOutputSeekbar;
@@ -122,9 +122,9 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        mMediaItems.add(MediaItem.createDeviceMediaItem(mMediaDevice1, true));

        mMediaItems.add(MediaItem.createDeviceMediaItem(mMediaDevice2, false));



        mMediaOutputAdapter = new MediaOutputAdapter(mMediaSwitchingController);

        mMediaOutputAdapter = new MediaOutputAdapterLegacy(mMediaSwitchingController);

        mMediaOutputAdapter.updateItems();

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mSpyMediaOutputSeekbar = spy(mViewHolder.mSeekBar);

    }
@@ -148,9 +148,9 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 


    @Test

    public void onBindViewHolder_bindPairNew_verifyView() {

        mMediaOutputAdapter = new MediaOutputAdapter(mMediaSwitchingController);

        mMediaOutputAdapter = new MediaOutputAdapterLegacy(mMediaSwitchingController);

        mMediaOutputAdapter.updateItems();

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaItems.add(MediaItem.createPairNewDeviceMediaItem());

        mMediaItems.add(MediaItem.createPairNewDeviceMediaItem());
@@ -173,9 +173,9 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
                                .map((item) -> item.getMediaDevice().get())

                                .collect(Collectors.toList()));

        when(mMediaSwitchingController.getSessionName()).thenReturn(TEST_SESSION_NAME);

        mMediaOutputAdapter = new MediaOutputAdapter(mMediaSwitchingController);

        mMediaOutputAdapter = new MediaOutputAdapterLegacy(mMediaSwitchingController);

        mMediaOutputAdapter.updateItems();

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.getItemCount();

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -195,9 +195,9 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
                                .map((item) -> item.getMediaDevice().get())

                                .collect(Collectors.toList()));

        when(mMediaSwitchingController.getSessionName()).thenReturn(null);

        mMediaOutputAdapter = new MediaOutputAdapter(mMediaSwitchingController);

        mMediaOutputAdapter = new MediaOutputAdapterLegacy(mMediaSwitchingController);

        mMediaOutputAdapter.updateItems();

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.getItemCount();

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -223,7 +223,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
    @Test

    public void onBindViewHolder_bindNonRemoteConnectedDevice_verifyView() {

        when(mMediaSwitchingController.isActiveRemoteDevice(mMediaDevice1)).thenReturn(false);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -243,7 +243,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaSwitchingController.getSelectableMediaDevice())

                .thenReturn(ImmutableList.of(mMediaDevice2));

        when(mMediaSwitchingController.isCurrentConnectedDeviceRemote()).thenReturn(true);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -262,7 +262,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaSwitchingController.getSelectableMediaDevice())

                .thenReturn(ImmutableList.of(mMediaDevice2));

        when(mMediaSwitchingController.isCurrentConnectedDeviceRemote()).thenReturn(true);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -274,7 +274,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
    public void onBindViewHolder_bindSingleConnectedRemoteDevice_verifyView() {

        when(mMediaSwitchingController.getSelectableMediaDevice()).thenReturn(ImmutableList.of());

        when(mMediaSwitchingController.isCurrentConnectedDeviceRemote()).thenReturn(true);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -292,7 +292,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaDevice1.hasOngoingSession()).thenReturn(true);

        when(mMediaSwitchingController.getSelectableMediaDevice()).thenReturn(ImmutableList.of());

        when(mMediaSwitchingController.isCurrentConnectedDeviceRemote()).thenReturn(true);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -313,7 +313,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaDevice1.isHostForOngoingSession()).thenReturn(true);

        when(mMediaSwitchingController.getSelectableMediaDevice()).thenReturn(ImmutableList.of());

        when(mMediaSwitchingController.isCurrentConnectedDeviceRemote()).thenReturn(true);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -346,7 +346,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaDevice1.isMutingExpectedDevice()).thenReturn(true);

        when(mMediaSwitchingController.isCurrentConnectedDeviceRemote()).thenReturn(false);

        when(mMediaSwitchingController.isActiveRemoteDevice(mMediaDevice1)).thenReturn(false);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -496,7 +496,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaDevice1.getSubtextString()).thenReturn(TEST_CUSTOM_SUBTEXT);

        when(mMediaDevice1.hasOngoingSession()).thenReturn(true);

        when(mMediaDevice1.getSelectionBehavior()).thenReturn(SELECTION_BEHAVIOR_GO_TO_APP);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -520,7 +520,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaDevice2.getSubtext()).thenReturn(SUBTEXT_SUBSCRIPTION_REQUIRED);

        when(mMediaDevice2.getSubtextString()).thenReturn(deviceStatus);

        when(mMediaDevice2.getSelectionBehavior()).thenReturn(SELECTION_BEHAVIOR_GO_TO_APP);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1);
@@ -543,7 +543,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaDevice2.getSubtext()).thenReturn(SUBTEXT_AD_ROUTING_DISALLOWED);

        when(mMediaDevice2.getSubtextString()).thenReturn(deviceStatus);

        when(mMediaDevice2.getSelectionBehavior()).thenReturn(SELECTION_BEHAVIOR_NONE);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1);
@@ -565,7 +565,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaDevice1.getSubtextString()).thenReturn(TEST_CUSTOM_SUBTEXT);

        when(mMediaDevice1.hasOngoingSession()).thenReturn(true);

        when(mMediaDevice1.getSelectionBehavior()).thenReturn(SELECTION_BEHAVIOR_GO_TO_APP);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -625,9 +625,9 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 


    @Test

    public void onItemClick_clickPairNew_verifyLaunchBluetoothPairing() {

        mMediaOutputAdapter = new MediaOutputAdapter(mMediaSwitchingController);

        mMediaOutputAdapter = new MediaOutputAdapterLegacy(mMediaSwitchingController);

        mMediaOutputAdapter.updateItems();

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaItems.add(MediaItem.createPairNewDeviceMediaItem());

        mMediaOutputAdapter.updateItems();
@@ -643,9 +643,9 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mMediaDevice2.getState()).isEqualTo(

                LocalMediaManager.MediaDeviceState.STATE_DISCONNECTED);

        when(mMediaDevice2.getSelectionBehavior()).thenReturn(SELECTION_BEHAVIOR_TRANSFER);

        mMediaOutputAdapter = new MediaOutputAdapter(mMediaSwitchingController);

        mMediaOutputAdapter = new MediaOutputAdapterLegacy(mMediaSwitchingController);

        mMediaOutputAdapter.updateItems();

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.getItemCount();

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -661,11 +661,12 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mMediaDevice2.getState()).isEqualTo(

                LocalMediaManager.MediaDeviceState.STATE_DISCONNECTED);

        when(mMediaDevice2.getSelectionBehavior()).thenReturn(SELECTION_BEHAVIOR_TRANSFER);

        mMediaOutputAdapter = new MediaOutputAdapter(mMediaSwitchingController);

        mMediaOutputAdapter = new MediaOutputAdapterLegacy(mMediaSwitchingController);

        mMediaOutputAdapter.updateItems();

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        MediaOutputAdapter.MediaDeviceViewHolder spyMediaDeviceViewHolder = spy(mViewHolder);

        MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy spyMediaDeviceViewHolder = spy(

                mViewHolder);

        mMediaOutputAdapter.getItemCount();



        mMediaOutputAdapter.onBindViewHolder(spyMediaDeviceViewHolder, 0);
@@ -682,11 +683,12 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaDevice2.getState()).thenReturn(

                LocalMediaManager.MediaDeviceState.STATE_DISCONNECTED);

        when(mMediaDevice2.getSelectionBehavior()).thenReturn(SELECTION_BEHAVIOR_GO_TO_APP);

        mMediaOutputAdapter = new MediaOutputAdapter(mMediaSwitchingController);

        mMediaOutputAdapter = new MediaOutputAdapterLegacy(mMediaSwitchingController);

        mMediaOutputAdapter.updateItems();

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        MediaOutputAdapter.MediaDeviceViewHolder spyMediaDeviceViewHolder = spy(mViewHolder);

        MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy spyMediaDeviceViewHolder = spy(

                mViewHolder);



        mMediaOutputAdapter.onBindViewHolder(spyMediaDeviceViewHolder, 1);

        spyMediaDeviceViewHolder.mContainerLayout.performClick();
@@ -713,7 +715,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        List<MediaDevice> selectableDevices = new ArrayList<>();

        selectableDevices.add(mMediaDevice2);

        when(mMediaSwitchingController.getSelectableMediaDevice()).thenReturn(selectableDevices);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1);
@@ -857,7 +859,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaSwitchingController.getSelectedMediaDevice())

                .thenReturn(ImmutableList.of(mMediaDevice1));

        when(mMediaSwitchingController.isCurrentConnectedDeviceRemote()).thenReturn(true);

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(new LinearLayout(mContext), 0);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -978,7 +980,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
    public void multipleSelectedDevices_verifySessionView() {

        initializeSession();



        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(

                        new LinearLayout(mContext), MediaItem.MediaItemType.TYPE_DEVICE);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -999,7 +1001,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
    public void multipleSelectedDevices_verifyCollapsedView() {

        initializeSession();



        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(

                        new LinearLayout(mContext), MediaItem.MediaItemType.TYPE_DEVICE);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1);
@@ -1012,13 +1014,13 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
    @Test

    public void multipleSelectedDevices_expandIconClicked_verifyInitialView() {

        initializeSession();

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(

                        new LinearLayout(mContext), MediaItem.MediaItemType.TYPE_DEVICE);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);



        mViewHolder.mEndTouchArea.performClick();

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(

                        new LinearLayout(mContext), MediaItem.MediaItemType.TYPE_DEVICE);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);
@@ -1035,13 +1037,13 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
    @Test

    public void multipleSelectedDevices_expandIconClicked_verifyCollapsedView() {

        initializeSession();

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(

                        new LinearLayout(mContext), MediaItem.MediaItemType.TYPE_DEVICE);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);



        mViewHolder.mEndTouchArea.performClick();

        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(

                        new LinearLayout(mContext), MediaItem.MediaItemType.TYPE_DEVICE);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1);
@@ -1063,7 +1065,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaSwitchingController.getSelectedMediaDevice()).thenReturn(selectedDevices);

        when(mMediaSwitchingController.getDeselectableMediaDevice()).thenReturn(new ArrayList<>());



        mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter

        mViewHolder = (MediaOutputAdapterLegacy.MediaDeviceViewHolderLegacy) mMediaOutputAdapter

                .onCreateViewHolder(

                        new LinearLayout(mContext), MediaItem.MediaItemType.TYPE_DEVICE);

        mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);

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

+34 −60
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.graphics.drawable.Drawable; 
import android.text.TextUtils;

import android.util.Log;

import android.view.View;

import android.view.ViewGroup;



import androidx.annotation.DoNotInline;

import androidx.annotation.NonNull;
@@ -43,19 +42,30 @@ import java.util.List; 
import java.util.concurrent.CopyOnWriteArrayList;



/**

 * Adapter for media output dialog.

 * A parent RecyclerView adapter for the media output dialog device list. This class doesn't

 * manipulate the layout directly.

 */

public class MediaOutputAdapter extends MediaOutputBaseAdapter {

public abstract class MediaOutputAdapterBase extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

    record OngoingSessionStatus(boolean host) {}



    record GroupStatus(Boolean selected, Boolean deselectable) {}



    enum ConnectionState {

        CONNECTED,

        CONNECTING,

        DISCONNECTED,

    }



    protected final MediaSwitchingController mController;

    private int mCurrentActivePosition;

    private boolean mIsDragging;

    private static final String TAG = "MediaOutputAdapter";

    private static final String TAG = "MediaOutputAdapterBase";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

    private final List<MediaItem> mMediaItemList = new CopyOnWriteArrayList<>();

    protected final List<MediaItem> mMediaItemList = new CopyOnWriteArrayList<>();

    private boolean mShouldGroupSelectedMediaItems = Flags.enableOutputSwitcherDeviceGrouping();



    public MediaOutputAdapter(MediaSwitchingController controller) {

        super(controller);

    public MediaOutputAdapterBase(MediaSwitchingController controller) {

        mController = controller;

        mCurrentActivePosition = -1;

        mIsDragging = false;

        setHasStableIds(true);
@@ -77,22 +87,19 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
        return false;

    }



    @Override

    boolean isDragging() {

        return mIsDragging;

    }



    @Override

    void setIsDragging(boolean isDragging) {

        mIsDragging = isDragging;

    }



    @Override

    int getCurrentActivePosition() {

        return mCurrentActivePosition;

    }



    @Override

    /** Refreshes the RecyclerView dataset and forces re-render. */

    public void updateItems() {

        mMediaItemList.clear();

        mMediaItemList.addAll(mController.getMediaItemList());
@@ -105,47 +112,6 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
        notifyDataSetChanged();

    }



    @Override

    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup,

            int viewType) {

        super.onCreateViewHolder(viewGroup, viewType);

        switch (viewType) {

            case MediaItem.MediaItemType.TYPE_GROUP_DIVIDER:

                return new MediaGroupDividerViewHolder(mHolderView);

            case MediaItem.MediaItemType.TYPE_PAIR_NEW_DEVICE:

            case MediaItem.MediaItemType.TYPE_DEVICE:

            default:

                return new MediaDeviceViewHolder(mHolderView);

        }

    }



    @Override

    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {

        if (position >= mMediaItemList.size()) {

            if (DEBUG) {

                Log.d(TAG, "Incorrect position: " + position + " list size: "

                        + mMediaItemList.size());

            }

            return;

        }

        MediaItem currentMediaItem = mMediaItemList.get(position);

        switch (currentMediaItem.getMediaItemType()) {

            case MediaItem.MediaItemType.TYPE_GROUP_DIVIDER:

                ((MediaGroupDividerViewHolder) viewHolder).onBind(currentMediaItem.getTitle());

                break;

            case MediaItem.MediaItemType.TYPE_PAIR_NEW_DEVICE:

                ((MediaDeviceViewHolder) viewHolder).onBindPairNewDevice();

                break;

            case MediaItem.MediaItemType.TYPE_DEVICE:

                ((MediaDeviceViewHolder) viewHolder).onBind(

                        currentMediaItem,

                        position);

                break;

            default:

                Log.d(TAG, "Incorrect position: " + position);

        }

    }



    @Override

    public long getItemId(int position) {

        if (position >= mMediaItemList.size()) {
@@ -172,15 +138,17 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
        return mMediaItemList.size();

    }



    class MediaDeviceViewHolder extends MediaDeviceBaseViewHolder {

    abstract class MediaDeviceViewHolderBase extends RecyclerView.ViewHolder {



        Context mContext;



        MediaDeviceViewHolder(View view) {

        MediaDeviceViewHolderBase(View view, Context context) {

            super(view);

            mContext = context;

        }



        void onBind(MediaItem mediaItem, int position) {

        void renderItem(MediaItem mediaItem, int position) {

            MediaDevice device = mediaItem.getMediaDevice().get();

            super.onBind(device, position);

            boolean isMutingExpectedDeviceExist = mController.hasMutingExpectedDevice();

            final boolean currentlyConnected = isCurrentlyConnected(device);

            boolean isSelected = isDeviceIncluded(mController.getSelectedMediaDevice(), device);
@@ -291,6 +259,16 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            }

        }



        protected abstract void renderDeviceItem(boolean hideGroupItem, MediaDevice device,

                ConnectionState connectionState, boolean restrictVolumeAdjustment,

                GroupStatus groupStatus, OngoingSessionStatus ongoingSessionStatus,

                View.OnClickListener clickListener, boolean deviceDisabled, String subtitle,

                Drawable deviceStatusIcon);



        protected abstract void renderDeviceGroupItem();



        protected abstract void disableSeekBar();



        private OngoingSessionStatus getOngoingSessionStatus(MediaDevice device) {

            return device.hasOngoingSession() ? new OngoingSessionStatus(

                    device.isHostForOngoingSession()) : null;
@@ -332,13 +310,11 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            }

        }



        @Override

        protected void onExpandGroupButtonClicked() {

            mShouldGroupSelectedMediaItems = false;

            notifyDataSetChanged();

        }



        @Override

        protected void onGroupActionTriggered(boolean isChecked, MediaDevice device) {

            disableSeekBar();

            if (isChecked && isDeviceIncluded(mController.getSelectableMediaDevice(), device)) {
@@ -385,7 +361,6 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            notifyDataSetChanged();

        }



        @Override

        protected String getDeviceItemContentDescription(@NonNull MediaDevice device) {

            return mContext.getString(

                    device.getDeviceType() == MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE
@@ -393,7 +368,6 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                            : R.string.accessibility_cast_name, device.getName());

        }



        @Override

        protected String getGroupItemContentDescription(String sessionName) {

            return mContext.getString(R.string.accessibility_cast_name, sessionName);

        }

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

+55 −46

File changed and moved.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog 
    private boolean mIsLeBroadcastCallbackRegistered;

    private boolean mDismissing;



    MediaOutputBaseAdapter mAdapter;

    MediaOutputAdapterBase mAdapter;



    protected Executor mExecutor;

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

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ public class MediaOutputBroadcastDialog extends MediaOutputBaseDialog { 
                broadcastSender,

                mediaSwitchingController, /* includePlaybackAndAppMetadata */

                true);

        mAdapter = new MediaOutputAdapter(mMediaSwitchingController);

        mAdapter = new MediaOutputAdapterLegacy(mMediaSwitchingController);

        // TODO(b/226710953): Move the part to MediaOutputBaseDialog for every class

        //  that extends MediaOutputBaseDialog

        if (!aboveStatusbar) {