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

Merge "Hide ambient control when there's no valid control point" into main

Browse Source
This commit is contained in:
Angela Wang
2025-02-06 09:17:37 -08:00
committed by Android (Google) Code Review
parent bf792b4081 11debff2be
commit 6f0f6e7cf6
2 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/bluetooth/BluetoothDetailsAmbientVolumePreferenceController.java
View File

@@ -129,8 +129,11 @@ public class BluetoothDetailsAmbientVolumePreferenceController extends Bluetooth
@Override
public boolean isAvailable() {
return mCachedDevice.isHearingDevice() && mCachedDevice.getProfiles().stream().anyMatch(
profile -> profile instanceof VolumeControlProfile);
return mCachedDevice.isHearingDevice()
&& mCachedDevice.getProfiles().stream().anyMatch(
profile -> profile instanceof VolumeControlProfile)
&& mAmbientUiController != null
&& mAmbientUiController.isAmbientControlAvailable();
}
@Nullable

49
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsAmbientVolumePreferenceControllerTest.java
View File

@@ -98,30 +98,44 @@ public class BluetoothDetailsAmbientVolumePreferenceControllerTest extends
@Test
public void isAvailable_notHearingDevice_returnFalse() {
when(mCachedDevice.isHearingDevice()).thenReturn(false);
when(mCachedDevice.getProfiles()).thenReturn(List.of(mVolumeControlProfile));
when(mUiController.isAmbientControlAvailable()).thenReturn(true);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void isAvailable_isHearingDeviceAndNotSupportVcp_returnFalse() {
public void isAvailable_notSupportVcp_returnFalse() {
when(mCachedDevice.isHearingDevice()).thenReturn(true);
when(mCachedDevice.getProfiles()).thenReturn(List.of());
when(mUiController.isAmbientControlAvailable()).thenReturn(true);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void isAvailable_isHearingDeviceAndSupportVcp_returnTrue() {
public void isAvailable_noValidAmbientControlPoint_returnFalse() {
when(mCachedDevice.isHearingDevice()).thenReturn(true);
when(mCachedDevice.getProfiles()).thenReturn(List.of(mVolumeControlProfile));
when(mUiController.isAmbientControlAvailable()).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void isAvailable_isHearingDevice_supportVcp_validAmbientControl_returnTrue() {
when(mCachedDevice.isHearingDevice()).thenReturn(true);
when(mCachedDevice.getProfiles()).thenReturn(List.of(mVolumeControlProfile));
when(mUiController.isAmbientControlAvailable()).thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void refresh_isHearingDeviceAndNotSupportVcp_verifyUiControllerNoRefresh() {
when(mCachedDevice.isHearingDevice()).thenReturn(true);
when(mCachedDevice.getProfiles()).thenReturn(List.of());
public void refresh_notHearingDevice_verifyUiControllerNotRefresh() {
when(mCachedDevice.isHearingDevice()).thenReturn(false);
when(mCachedDevice.getProfiles()).thenReturn(List.of(mVolumeControlProfile));
when(mUiController.isAmbientControlAvailable()).thenReturn(true);
mController.refresh();
@@ -129,9 +143,32 @@ public class BluetoothDetailsAmbientVolumePreferenceControllerTest extends
}
@Test
public void refresh_isHearingDeviceAndSupportVcp_verifyUiControllerRefresh() {
public void refresh_notSupportVcp_verifyUiControllerNotRefresh() {
when(mCachedDevice.isHearingDevice()).thenReturn(true);
when(mCachedDevice.getProfiles()).thenReturn(List.of());
when(mUiController.isAmbientControlAvailable()).thenReturn(true);
mController.refresh();
verify(mUiController, never()).refresh();
}
@Test
public void refresh_noValidAmbientControl_verifyUiControllerNotRefresh() {
when(mCachedDevice.isHearingDevice()).thenReturn(true);
when(mCachedDevice.getProfiles()).thenReturn(List.of(mVolumeControlProfile));
when(mUiController.isAmbientControlAvailable()).thenReturn(false);
mController.refresh();
verify(mUiController, never()).refresh();
}
@Test
public void refresh_isHearingDevice_supportVcp_validAmbientControl_verifyUiControllerRefresh() {
when(mCachedDevice.isHearingDevice()).thenReturn(true);
when(mCachedDevice.getProfiles()).thenReturn(List.of(mVolumeControlProfile));
when(mUiController.isAmbientControlAvailable()).thenReturn(true);
mController.refresh();