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

Commit 7d5745c2 authored by Alexandr Shabalin's avatar Alexandr Shabalin Committed by Android (Google) Code Review
Browse files

Merge changes from topic "ashabalin-rename-media-output-adapter" into main 

* changes:
  Turn around the inheritance dependency for MediaOutputAdapter classes.
  Separate the UI state and view manipulation for the device list.
parents 6a0718ba 01b6599e

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

+43 −53
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.WallpaperColors;

import android.graphics.Bitmap;

import android.graphics.drawable.Icon;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;
@@ -68,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";
@@ -92,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;
@@ -124,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);

    }
@@ -150,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());
@@ -175,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);
@@ -197,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);
@@ -225,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);
@@ -245,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);
@@ -264,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);
@@ -276,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);
@@ -294,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);
@@ -315,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);
@@ -348,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);
@@ -498,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);
@@ -522,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);
@@ -545,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);
@@ -567,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);
@@ -627,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();
@@ -645,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);
@@ -663,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);
@@ -684,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();
@@ -715,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);
@@ -859,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);
@@ -898,16 +898,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mViewHolder.mSeekBar.isEnabled()).isTrue();

    }



    @Test

    public void updateColorScheme_triggerController() {

        WallpaperColors wallpaperColors = WallpaperColors.fromBitmap(

                Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888));



        mMediaOutputAdapter.updateColorScheme(wallpaperColors, true);



        verify(mMediaSwitchingController).setCurrentColorScheme(wallpaperColors, true);

    }



    @Test

    public void updateItems_controllerItemsUpdated_notUpdatesInAdapterUntilUpdateItems() {

        mMediaOutputAdapter.updateItems();
@@ -990,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);
@@ -1011,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);
@@ -1024,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);
@@ -1047,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);
@@ -1075,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

+68 −244

File changed and moved.

Preview size limit exceeded, changes collapsed.

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

+246 −65

File changed and moved.

Preview size limit exceeded, changes collapsed.

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

+2 −2
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;
@@ -342,7 +342,7 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog 
                WallpaperColors wallpaperColors = WallpaperColors.fromBitmap(icon.getBitmap());

                colorSetUpdated = !wallpaperColors.equals(mWallpaperColors);

                if (colorSetUpdated) {

                    mAdapter.updateColorScheme(wallpaperColors, isDarkThemeOn);

                    mMediaSwitchingController.setCurrentColorScheme(wallpaperColors, isDarkThemeOn);

                    updateButtonBackgroundColorFilter();

                    updateDialogBackgroundColor();

                }

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