Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "eOutput Switcher] Fix Dialog refreshing shortage" into tm-qpr-dev

Browse Source
This commit is contained in:
Shaowei Shen
2022-08-31 04:55:50 +00:00
committed by Android (Google) Code Review
parent f2b50de574 f770f11d54
commit ac786fe1fb
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,15 +356,6 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
mHeaderSubtitle.setText(subTitle); mHeaderSubtitle.setText(subTitle);
mHeaderTitle.setGravity(Gravity.NO_GRAVITY); 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 // Show when remote media session is available or
// when the device supports BT LE audio + media is playing // when the device supports BT LE audio + media is playing
mStopButton.setVisibility(getStopButtonVisibility()); mStopButton.setVisibility(getStopButtonVisibility());
@@ -374,6 +365,18 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
mBroadcastIcon.setVisibility(getBroadcastIconVisibility()); mBroadcastIcon.setVisibility(getBroadcastIconVisibility());
mBroadcastIcon.setOnClickListener(v -> onBroadcastIconClick()); 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() { private void updateButtonBackgroundColorFilter() {

8
packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBaseDialogTest.java
View File

@@ -223,6 +223,14 @@ public class MediaOutputBaseDialogTest extends SysuiTestCase {
verify(mMediaOutputBaseAdapter, never()).notifyDataSetChanged(); verify(mMediaOutputBaseAdapter, never()).notifyDataSetChanged();
} }
@Test
public void refresh_inDragging_directSetRefreshingToFalse() {
when(mMediaOutputBaseAdapter.isDragging()).thenReturn(true);
mMediaOutputBaseDialogImpl.refresh();
assertThat(mMediaOutputController.isRefreshing()).isFalse();
}
@Test @Test
public void refresh_notInDragging_verifyUpdateAdapter() { public void refresh_notInDragging_verifyUpdateAdapter() {
when(mMediaOutputBaseAdapter.getCurrentActivePosition()).thenReturn(-1); when(mMediaOutputBaseAdapter.getCurrentActivePosition()).thenReturn(-1);