PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Audiosharing] Update the dialog content in place" into main

Browse Source
This commit is contained in:
Yiyi Shen
2025-03-03 01:27:26 -08:00
committed by Android (Google) Code Review
parent dc5ed1f3a1 a55759efe0
commit f4b8e05eeb
9 changed files with 270 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceItemTest.java
View File

@@ -24,6 +24,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import java.util.Objects;
@RunWith(RobolectricTestRunner.class)
public class AudioSharingDeviceItemTest {
private static final String TEST_NAME = "test";
@@ -87,4 +89,28 @@ public class AudioSharingDeviceItemTest {
"AudioSharingDeviceItem groupId = " + TEST_GROUP_ID + ", isActive = "
+ TEST_IS_ACTIVE);
}
@Test
public void equals_returnsFalse() {
AudioSharingDeviceItem item =
new AudioSharingDeviceItem(TEST_NAME, TEST_GROUP_ID, TEST_IS_ACTIVE);
assertThat(item.equals(null)).isFalse();
}
@Test
public void equals_returnsTrue() {
AudioSharingDeviceItem item1 =
new AudioSharingDeviceItem(TEST_NAME, TEST_GROUP_ID, TEST_IS_ACTIVE);
AudioSharingDeviceItem item2 =
new AudioSharingDeviceItem(TEST_NAME, TEST_GROUP_ID, TEST_IS_ACTIVE);
assertThat(item1.equals(item2)).isTrue();
}
@Test
public void hash() {
AudioSharingDeviceItem item = new AudioSharingDeviceItem(TEST_NAME, TEST_GROUP_ID,
TEST_IS_ACTIVE);
assertThat(item.hashCode()).isEqualTo(
Objects.hash(TEST_NAME, TEST_GROUP_ID, TEST_IS_ACTIVE));
}
}

20
tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragmentTest.java
View File

@@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.shadows.ShadowLooper.shadowMainLooper;
@@ -231,11 +230,6 @@ public class AudioSharingDisconnectDialogFragmentTest {
shadowMainLooper().idle();
dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(dialog.isShowing()).isTrue();
verify(mFeatureFactory.metricsFeatureProvider, times(0))
.action(
any(Context.class),
eq(SettingsEnums.ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS),
eq(SettingsEnums.DIALOG_AUDIO_SHARING_SWITCH_DEVICE));
btn1 = view.findViewHolderForAdapterPosition(0).itemView.findViewById(R.id.device_button);
btn1.performClick();
@@ -251,7 +245,7 @@ public class AudioSharingDisconnectDialogFragmentTest {
@Test
@EnableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)
public void onCreateDialog_dialogIsShowingForNewGroup_showNewDialog() {
public void onCreateDialog_dialogIsShowingForNewGroup_updateDialog() {
mDeviceItems = new ArrayList<>();
mDeviceItems.add(TEST_DEVICE_ITEM1);
mDeviceItems.add(TEST_DEVICE_ITEM2);
@@ -265,7 +259,7 @@ public class AudioSharingDisconnectDialogFragmentTest {
assertThat(view).isNotNull();
assertThat(view.getAdapter().getItemCount()).isEqualTo(2);
// Show new dialog for device with new group
// Update dialog content for device with new group
ArrayList<AudioSharingDeviceItem> newDeviceItems = new ArrayList<>();
newDeviceItems.add(TEST_DEVICE_ITEM2);
newDeviceItems.add(TEST_DEVICE_ITEM3);
@@ -278,11 +272,6 @@ public class AudioSharingDisconnectDialogFragmentTest {
shadowMainLooper().idle();
dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(dialog.isShowing()).isTrue();
verify(mFeatureFactory.metricsFeatureProvider)
.action(
any(Context.class),
eq(SettingsEnums.ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS),
eq(SettingsEnums.DIALOG_AUDIO_SHARING_SWITCH_DEVICE));
view = dialog.findViewById(R.id.device_btn_list);
assertThat(view).isNotNull();
@@ -323,11 +312,6 @@ public class AudioSharingDisconnectDialogFragmentTest {
assertThat(dialog.isShowing()).isFalse();
assertThat(mParent.getActivity().isFinishing()).isFalse();
verify(mFeatureFactory.metricsFeatureProvider, times(0))
.action(
any(Context.class),
eq(SettingsEnums.ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS),
eq(SettingsEnums.DIALOG_AUDIO_SHARING_SWITCH_DEVICE));
verify(mFeatureFactory.metricsFeatureProvider)
.action(
any(Context.class),

25
tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragmentTest.java
View File

@@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.shadows.ShadowLooper.shadowMainLooper;
@@ -238,11 +237,6 @@ public class AudioSharingStopDialogFragmentTest {
dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(dialog).isNotNull();
assertThat(dialog.isShowing()).isTrue();
verify(mFeatureFactory.metricsFeatureProvider, times(0))
.action(
any(Context.class),
eq(SettingsEnums.ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS),
eq(SettingsEnums.DIALOG_STOP_AUDIO_SHARING));
View btnView = dialog.findViewById(android.R.id.button1);
assertThat(btnView).isNotNull();
@@ -259,7 +253,7 @@ public class AudioSharingStopDialogFragmentTest {
@Test
@EnableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)
public void onCreateDialog_dialogIsShowingForNewDevice_showNewDialog() {
public void onCreateDialog_dialogIsShowingForNewDevice_updateDialog() {
AudioSharingStopDialogFragment.show(
mParent,
ImmutableList.of(),
@@ -281,7 +275,7 @@ public class AudioSharingStopDialogFragmentTest {
mParent.getString(
R.string.audio_sharing_stop_dialog_title, TEST_DEVICE_NAME1));
// Show new dialog
// Update the dialog content
AudioSharingStopDialogFragment.show(
mParent,
ImmutableList.of(),
@@ -292,11 +286,6 @@ public class AudioSharingStopDialogFragmentTest {
dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(dialog).isNotNull();
assertThat(dialog.isShowing()).isTrue();
verify(mFeatureFactory.metricsFeatureProvider)
.action(
any(Context.class),
eq(SettingsEnums.ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS),
eq(SettingsEnums.DIALOG_STOP_AUDIO_SHARING));
view = dialog.findViewById(R.id.description_text);
assertThat(view).isNotNull();
@@ -329,11 +318,6 @@ public class AudioSharingStopDialogFragmentTest {
shadowMainLooper().idle();
assertThat(dialog.isShowing()).isFalse();
assertThat(mParent.getActivity().isFinishing()).isFalse();
verify(mFeatureFactory.metricsFeatureProvider, times(0))
.action(
any(Context.class),
eq(SettingsEnums.ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS),
eq(SettingsEnums.DIALOG_STOP_AUDIO_SHARING));
verify(mFeatureFactory.metricsFeatureProvider)
.action(
any(Context.class),
@@ -362,11 +346,6 @@ public class AudioSharingStopDialogFragmentTest {
assertThat(dialog.isShowing()).isFalse();
assertThat(isStopBtnClicked.get()).isTrue();
assertThat(mParent.getActivity().isFinishing()).isFalse();
verify(mFeatureFactory.metricsFeatureProvider, times(0))
.action(
any(Context.class),
eq(SettingsEnums.ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS),
eq(SettingsEnums.DIALOG_STOP_AUDIO_SHARING));
verify(mFeatureFactory.metricsFeatureProvider)
.action(
any(Context.class),