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

Remove "Play media to" when no connected device

Browse Source 
Bug: 130251782
Test: make -j42 RunSettingsRoboTests
Change-Id: Id40199a67aef48b99f59cf6e04f93be2abe5e8fc
This commit is contained in:
Tim Peng
2019-04-22 14:05:09 +08:00
committed by tim peng
parent f263f489e2
commit 99ed023ca4
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/media/MediaOutputIndicatorSlice.java
View File

@@ -114,29 +114,29 @@ public class MediaOutputIndicatorSlice implements CustomSliceable {
private boolean isVisible() { private boolean isVisible() {
// To decide Slice's visibility. // To decide Slice's visibility.
// return true if device is connected or previously connected, false for other cases. // return true if device is connected or previously connected, false for other cases.
return !CollectionUtils.isEmpty(getConnectableA2dpDevices()) return !CollectionUtils.isEmpty(getConnectedA2dpDevices())
|| !CollectionUtils.isEmpty(getConnectableHearingAidDevices()); || !CollectionUtils.isEmpty(getConnectedHearingAidDevices());
} }
private List<BluetoothDevice> getConnectableA2dpDevices() { private List<BluetoothDevice> getConnectedA2dpDevices() {
// Get A2dp devices on all states // Get A2dp devices on states
// (STATE_DISCONNECTED, STATE_CONNECTING, STATE_CONNECTED, STATE_DISCONNECTING) // (STATE_CONNECTING, STATE_CONNECTED, STATE_DISCONNECTING)
final A2dpProfile a2dpProfile = mProfileManager.getA2dpProfile(); final A2dpProfile a2dpProfile = mProfileManager.getA2dpProfile();
if (a2dpProfile == null) { if (a2dpProfile == null) {
return new ArrayList<>(); return new ArrayList<>();
} }
return a2dpProfile.getConnectableDevices(); return a2dpProfile.getConnectedDevices();
} }
private List<BluetoothDevice> getConnectableHearingAidDevices() { private List<BluetoothDevice> getConnectedHearingAidDevices() {
// Get hearing aid profile devices on all states // Get hearing aid profile devices on states
// (STATE_DISCONNECTED, STATE_CONNECTING, STATE_CONNECTED, STATE_DISCONNECTING) // (STATE_CONNECTING, STATE_CONNECTED, STATE_DISCONNECTING)
final HearingAidProfile hapProfile = mProfileManager.getHearingAidProfile(); final HearingAidProfile hapProfile = mProfileManager.getHearingAidProfile();
if (hapProfile == null) { if (hapProfile == null) {
return new ArrayList<>(); return new ArrayList<>();
} }
return hapProfile.getConnectableDevices(); return hapProfile.getConnectedDevices();
} }
private CharSequence findActiveDeviceName() { private CharSequence findActiveDeviceName() {

10
tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
View File

@@ -106,9 +106,9 @@ public class MediaOutputIndicatorSliceTest {
} }
@Test @Test
public void getSlice_noConnectableDevice_returnNull() { public void getSlice_noConnectedDevice_returnNull() {
mDevicesList.clear(); mDevicesList.clear();
when(mA2dpProfile.getConnectableDevices()).thenReturn(mDevicesList); when(mA2dpProfile.getConnectedDevices()).thenReturn(mDevicesList);
assertThat(mMediaOutputIndicatorSlice.getSlice()).isNull(); assertThat(mMediaOutputIndicatorSlice.getSlice()).isNull();
} }
@@ -116,7 +116,7 @@ public class MediaOutputIndicatorSliceTest {
@Test @Test
public void getSlice_noActiveDevice_verifyDefaultName() { public void getSlice_noActiveDevice_verifyDefaultName() {
mDevicesList.add(mA2dpDevice); mDevicesList.add(mA2dpDevice);
when(mA2dpProfile.getConnectableDevices()).thenReturn(mDevicesList); when(mA2dpProfile.getConnectedDevices()).thenReturn(mDevicesList);
when(mA2dpProfile.getActiveDevice()).thenReturn(null); when(mA2dpProfile.getActiveDevice()).thenReturn(null);
// Verify slice title and subtitle // Verify slice title and subtitle
@@ -130,7 +130,7 @@ public class MediaOutputIndicatorSliceTest {
@Test @Test
public void getSlice_A2dpDeviceActive_verifyName() { public void getSlice_A2dpDeviceActive_verifyName() {
mDevicesList.add(mA2dpDevice); mDevicesList.add(mA2dpDevice);
when(mA2dpProfile.getConnectableDevices()).thenReturn(mDevicesList); when(mA2dpProfile.getConnectedDevices()).thenReturn(mDevicesList);
when(mA2dpProfile.getActiveDevice()).thenReturn(mA2dpDevice); when(mA2dpProfile.getActiveDevice()).thenReturn(mA2dpDevice);
final Slice mediaSlice = mMediaOutputIndicatorSlice.getSlice(); final Slice mediaSlice = mMediaOutputIndicatorSlice.getSlice();
@@ -142,7 +142,7 @@ public class MediaOutputIndicatorSliceTest {
@Test @Test
public void getSlice_HADeviceActive_verifyName() { public void getSlice_HADeviceActive_verifyName() {
mDevicesList.add(mHapDevice); mDevicesList.add(mHapDevice);
when(mHearingAidProfile.getConnectableDevices()).thenReturn(mDevicesList); when(mHearingAidProfile.getConnectedDevices()).thenReturn(mDevicesList);
when(mHearingAidProfile.getActiveDevices()).thenReturn(mDevicesList); when(mHearingAidProfile.getActiveDevices()).thenReturn(mDevicesList);
// Verify slice title and subtitle // Verify slice title and subtitle