Merge "eOutput Switcher] Fix Dialog refreshing shortage" into tm-qpr-dev (ac786fe1) · Commits · e / os / android_frameworks_base

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

+12 −9

Original line number	Diff line number	Diff line
		@@ -356,15 +356,6 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
		mHeaderSubtitle.setText(subTitle);
		mHeaderTitle.setGravity(Gravity.NO_GRAVITY);
		}
		if (!mAdapter.isDragging()) {
		int currentActivePosition = mAdapter.getCurrentActivePosition();
		if (!colorSetUpdated && !deviceSetChanged && currentActivePosition >= 0
		&& currentActivePosition < mAdapter.getItemCount()) {
		mAdapter.notifyItemChanged(currentActivePosition);
		} else {
		mAdapter.notifyDataSetChanged();
		}
		}
		// Show when remote media session is available or
		// when the device supports BT LE audio + media is playing
		mStopButton.setVisibility(getStopButtonVisibility());
		@@ -374,6 +365,18 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements

		mBroadcastIcon.setVisibility(getBroadcastIconVisibility());
		mBroadcastIcon.setOnClickListener(v -> onBroadcastIconClick());
		if (!mAdapter.isDragging()) {
		int currentActivePosition = mAdapter.getCurrentActivePosition();
		if (!colorSetUpdated && !deviceSetChanged && currentActivePosition >= 0
		&& currentActivePosition < mAdapter.getItemCount()) {
		mAdapter.notifyItemChanged(currentActivePosition);
		} else {
		mAdapter.notifyDataSetChanged();
		}
		} else {
		mMediaOutputController.setRefreshing(false);
		mMediaOutputController.refreshDataSetIfNeeded();
		}
		}

		private void updateButtonBackgroundColorFilter() {

+8 −0

Original line number	Diff line number	Diff line
		@@ -223,6 +223,14 @@ public class MediaOutputBaseDialogTest extends SysuiTestCase {
		verify(mMediaOutputBaseAdapter, never()).notifyDataSetChanged();
		}

		@Test
		public void refresh_inDragging_directSetRefreshingToFalse() {
		when(mMediaOutputBaseAdapter.isDragging()).thenReturn(true);
		mMediaOutputBaseDialogImpl.refresh();

		assertThat(mMediaOutputController.isRefreshing()).isFalse();
		}

		@Test
		public void refresh_notInDragging_verifyUpdateAdapter() {
		when(mMediaOutputBaseAdapter.getCurrentActivePosition()).thenReturn(-1);