diff options
2 files changed, 14 insertions, 21 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java index 1122772e8e62..8e8867b80dc2 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java @@ -820,25 +820,20 @@ public class MediaOutputAdapterTest extends SysuiTestCase { @DisableFlags(Flags.FLAG_ENABLE_OUTPUT_SWITCHER_SESSION_GROUPING) @Test - public void onItemClick_onGroupActionTriggered_verifySeekbarDisabled() { - when(mMediaSwitchingController.getSelectedMediaDevice()) - .thenReturn( - mMediaItems.stream() - .map((item) -> item.getMediaDevice().get()) - .collect(Collectors.toList())); - mMediaOutputAdapter = new MediaOutputAdapter(mMediaSwitchingController); - mMediaOutputAdapter.updateItems(); - mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter - .onCreateViewHolder(new LinearLayout(mContext), 0); - List<MediaDevice> selectableDevices = new ArrayList<>(); - selectableDevices.add(mMediaDevice1); - when(mMediaSwitchingController.getSelectableMediaDevice()).thenReturn(selectableDevices); + public void onBindViewHolder_hasVolumeAdjustmentRestriction_verifySeekbarDisabled() { + when(mMediaSwitchingController.getSelectedMediaDevice()).thenReturn( + List.of(mMediaDevice1, mMediaDevice2)); + when(mMediaSwitchingController.isCurrentConnectedDeviceRemote()).thenReturn(true); when(mMediaSwitchingController.hasAdjustVolumeUserRestriction()).thenReturn(true); - mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0); + mMediaOutputAdapter.updateItems(); - mViewHolder.mContainerLayout.performClick(); + // Connected and selected device + mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0); + assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.GONE); - assertThat(mViewHolder.mSeekBar.isEnabled()).isFalse(); + // Selected device + mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1); + assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.GONE); } @Test diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java index 2bd006ff2eea..c9740811101b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java @@ -188,7 +188,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { GroupStatus groupStatus = null; OngoingSessionStatus ongoingSessionStatus = null; ConnectionState connectionState = ConnectionState.DISCONNECTED; - boolean restrictVolumeAdjustment = false; + boolean restrictVolumeAdjustment = mController.hasAdjustVolumeUserRestriction(); String subtitle = null; Drawable deviceStatusIcon = null; boolean deviceDisabled = false; @@ -200,8 +200,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { mItemLayout.setVisibility(View.VISIBLE); if (mController.isAnyDeviceTransferring()) { - if (device.getState() == MediaDeviceState.STATE_CONNECTING - && !mController.hasAdjustVolumeUserRestriction()) { + if (device.getState() == MediaDeviceState.STATE_CONNECTING) { connectionState = ConnectionState.CONNECTING; } } else { @@ -251,8 +250,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { true /* selected */, isDeselectable /* deselectable */); connectionState = ConnectionState.CONNECTED; - } else if (!mController.hasAdjustVolumeUserRestriction() - && currentlyConnected) { + } else if (currentlyConnected) { // single selected device if (isMutingExpectedDeviceExist && !mController.isCurrentConnectedDeviceRemote()) { |