Update summary in Accessibility -> Hearing aids
Bug: 225117843 Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidPreferenceControllerTest Change-Id: I19c08474349e9ae98cd3f296ba8423f920d55fcf
This commit is contained in:
@@ -39,12 +39,13 @@ import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
|
|||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
import com.android.settings.core.SubSettingLauncher;
|
import com.android.settings.core.SubSettingLauncher;
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||||
|
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
|
||||||
|
import com.android.settingslib.bluetooth.HearingAidProfile;
|
||||||
import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
||||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||||
import com.android.settingslib.core.lifecycle.events.OnStart;
|
import com.android.settingslib.core.lifecycle.events.OnStart;
|
||||||
import com.android.settingslib.core.lifecycle.events.OnStop;
|
import com.android.settingslib.core.lifecycle.events.OnStop;
|
||||||
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
import java.util.concurrent.FutureTask;
|
import java.util.concurrent.FutureTask;
|
||||||
@@ -82,15 +83,13 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC
|
|||||||
|
|
||||||
private final LocalBluetoothManager mLocalBluetoothManager;
|
private final LocalBluetoothManager mLocalBluetoothManager;
|
||||||
private final BluetoothAdapter mBluetoothAdapter;
|
private final BluetoothAdapter mBluetoothAdapter;
|
||||||
//cache value of supporting hearing aid or not
|
|
||||||
private boolean mHearingAidProfileSupported;
|
|
||||||
private FragmentManager mFragmentManager;
|
private FragmentManager mFragmentManager;
|
||||||
|
|
||||||
public AccessibilityHearingAidPreferenceController(Context context, String preferenceKey) {
|
public AccessibilityHearingAidPreferenceController(Context context, String preferenceKey) {
|
||||||
super(context, preferenceKey);
|
super(context, preferenceKey);
|
||||||
mLocalBluetoothManager = getLocalBluetoothManager();
|
mLocalBluetoothManager = getLocalBluetoothManager();
|
||||||
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
|
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
|
||||||
mHearingAidProfileSupported = isHearingAidProfileSupported();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -101,29 +100,25 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
return mHearingAidProfileSupported ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
|
return isHearingAidProfileSupported() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStart() {
|
public void onStart() {
|
||||||
if (mHearingAidProfileSupported) {
|
|
||||||
IntentFilter filter = new IntentFilter();
|
IntentFilter filter = new IntentFilter();
|
||||||
filter.addAction(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
|
filter.addAction(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
|
||||||
filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
|
filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
|
||||||
mContext.registerReceiver(mHearingAidChangedReceiver, filter);
|
mContext.registerReceiver(mHearingAidChangedReceiver, filter);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStop() {
|
public void onStop() {
|
||||||
if (mHearingAidProfileSupported) {
|
|
||||||
mContext.unregisterReceiver(mHearingAidChangedReceiver);
|
mContext.unregisterReceiver(mHearingAidChangedReceiver);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||||
if (TextUtils.equals(preference.getKey(), getPreferenceKey())){
|
if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
|
||||||
final CachedBluetoothDevice device = getConnectedHearingAidDevice();
|
final CachedBluetoothDevice device = getConnectedHearingAidDevice();
|
||||||
if (device == null) {
|
if (device == null) {
|
||||||
launchHearingAidInstructionDialog();
|
launchHearingAidInstructionDialog();
|
||||||
@@ -141,7 +136,27 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC
|
|||||||
if (device == null) {
|
if (device == null) {
|
||||||
return mContext.getText(R.string.accessibility_hearingaid_not_connected_summary);
|
return mContext.getText(R.string.accessibility_hearingaid_not_connected_summary);
|
||||||
}
|
}
|
||||||
return device.getName();
|
|
||||||
|
final int connectedNum = getConnectedHearingAidDeviceNum();
|
||||||
|
final CharSequence name = device.getName();
|
||||||
|
final int side = device.getDeviceSide();
|
||||||
|
final CachedBluetoothDevice subDevice = device.getSubDevice();
|
||||||
|
if (connectedNum > 1) {
|
||||||
|
return mContext.getString(R.string.accessibility_hearingaid_more_device_summary, name);
|
||||||
|
}
|
||||||
|
if (subDevice != null && subDevice.isConnected()) {
|
||||||
|
return mContext.getString(
|
||||||
|
R.string.accessibility_hearingaid_left_and_right_side_device_summary, name);
|
||||||
|
}
|
||||||
|
if (side == HearingAidProfile.DeviceSide.SIDE_INVALID) {
|
||||||
|
return mContext.getString(
|
||||||
|
R.string.accessibility_hearingaid_active_device_summary, name);
|
||||||
|
}
|
||||||
|
return (side == HearingAidProfile.DeviceSide.SIDE_LEFT)
|
||||||
|
? mContext.getString(
|
||||||
|
R.string.accessibility_hearingaid_left_side_device_summary, name)
|
||||||
|
: mContext.getString(
|
||||||
|
R.string.accessibility_hearingaid_right_side_device_summary, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setFragmentManager(FragmentManager fragmentManager) {
|
public void setFragmentManager(FragmentManager fragmentManager) {
|
||||||
@@ -150,33 +165,44 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC
|
|||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
CachedBluetoothDevice getConnectedHearingAidDevice() {
|
CachedBluetoothDevice getConnectedHearingAidDevice() {
|
||||||
if (!mHearingAidProfileSupported) {
|
if (!isHearingAidProfileSupported()) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) {
|
|
||||||
return null;
|
final CachedBluetoothDeviceManager deviceManager =
|
||||||
}
|
mLocalBluetoothManager.getCachedDeviceManager();
|
||||||
final List<BluetoothDevice> deviceList = mLocalBluetoothManager.getProfileManager()
|
final HearingAidProfile hearingAidProfile =
|
||||||
.getHearingAidProfile().getConnectedDevices();
|
mLocalBluetoothManager.getProfileManager().getHearingAidProfile();
|
||||||
final Iterator it = deviceList.iterator();
|
final List<BluetoothDevice> deviceList = hearingAidProfile.getConnectedDevices();
|
||||||
while (it.hasNext()) {
|
for (BluetoothDevice obj : deviceList) {
|
||||||
BluetoothDevice obj = (BluetoothDevice)it.next();
|
if (!deviceManager.isSubDevice(obj)) {
|
||||||
if (!mLocalBluetoothManager.getCachedDeviceManager().isSubDevice(obj)) {
|
return deviceManager.findDevice(obj);
|
||||||
return mLocalBluetoothManager.getCachedDeviceManager().findDevice(obj);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private int getConnectedHearingAidDeviceNum() {
|
||||||
|
if (!isHearingAidProfileSupported()) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
final CachedBluetoothDeviceManager deviceManager =
|
||||||
|
mLocalBluetoothManager.getCachedDeviceManager();
|
||||||
|
final HearingAidProfile hearingAidProfile =
|
||||||
|
mLocalBluetoothManager.getProfileManager().getHearingAidProfile();
|
||||||
|
final List<BluetoothDevice> deviceList = hearingAidProfile.getConnectedDevices();
|
||||||
|
return (int) deviceList.stream()
|
||||||
|
.filter(device -> !deviceManager.isSubDevice(device))
|
||||||
|
.count();
|
||||||
|
}
|
||||||
|
|
||||||
private boolean isHearingAidProfileSupported() {
|
private boolean isHearingAidProfileSupported() {
|
||||||
if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) {
|
if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final List<Integer> supportedList = mBluetoothAdapter.getSupportedProfiles();
|
final List<Integer> supportedList = mBluetoothAdapter.getSupportedProfiles();
|
||||||
if (supportedList.contains(BluetoothProfile.HEARING_AID)) {
|
return supportedList.contains(BluetoothProfile.HEARING_AID);
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private LocalBluetoothManager getLocalBluetoothManager() {
|
private LocalBluetoothManager getLocalBluetoothManager() {
|
||||||
|
@@ -18,9 +18,7 @@ package com.android.settings.accessibility;
|
|||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
import static org.mockito.ArgumentMatchers.any;
|
|
||||||
import static org.mockito.Mockito.doNothing;
|
import static org.mockito.Mockito.doNothing;
|
||||||
import static org.mockito.Mockito.never;
|
|
||||||
import static org.mockito.Mockito.spy;
|
import static org.mockito.Mockito.spy;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
@@ -48,7 +46,6 @@ import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
|
|||||||
|
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Ignore;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
@@ -63,7 +60,6 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@Ignore
|
|
||||||
@Config(shadows = {ShadowBluetoothAdapter.class, ShadowBluetoothUtils.class})
|
@Config(shadows = {ShadowBluetoothAdapter.class, ShadowBluetoothUtils.class})
|
||||||
public class AccessibilityHearingAidPreferenceControllerTest {
|
public class AccessibilityHearingAidPreferenceControllerTest {
|
||||||
private static final String TEST_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1";
|
private static final String TEST_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1";
|
||||||
@@ -82,6 +78,8 @@ public class AccessibilityHearingAidPreferenceControllerTest {
|
|||||||
@Mock
|
@Mock
|
||||||
private CachedBluetoothDevice mCachedBluetoothDevice;
|
private CachedBluetoothDevice mCachedBluetoothDevice;
|
||||||
@Mock
|
@Mock
|
||||||
|
private CachedBluetoothDevice mCachedSubBluetoothDevice;
|
||||||
|
@Mock
|
||||||
private CachedBluetoothDeviceManager mCachedDeviceManager;
|
private CachedBluetoothDeviceManager mCachedDeviceManager;
|
||||||
@Mock
|
@Mock
|
||||||
private LocalBluetoothManager mLocalBluetoothManager;
|
private LocalBluetoothManager mLocalBluetoothManager;
|
||||||
@@ -111,18 +109,54 @@ public class AccessibilityHearingAidPreferenceControllerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onHearingAidStateChanged_connected_updateHearingAidSummary() {
|
public void getSummary_connectedHearingAidRightSide_connectedRightSideSummary() {
|
||||||
|
when(mCachedBluetoothDevice.getDeviceSide()).thenReturn(
|
||||||
|
HearingAidProfile.DeviceSide.SIDE_RIGHT);
|
||||||
when(mHearingAidProfile.getConnectedDevices()).thenReturn(generateHearingAidDeviceList());
|
when(mHearingAidProfile.getConnectedDevices()).thenReturn(generateHearingAidDeviceList());
|
||||||
mPreferenceController.onStart();
|
mPreferenceController.onStart();
|
||||||
Intent intent = new Intent(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
|
Intent intent = new Intent(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
|
||||||
intent.putExtra(BluetoothHearingAid.EXTRA_STATE, BluetoothHearingAid.STATE_CONNECTED);
|
intent.putExtra(BluetoothHearingAid.EXTRA_STATE, BluetoothHearingAid.STATE_CONNECTED);
|
||||||
sendIntent(intent);
|
sendIntent(intent);
|
||||||
|
|
||||||
assertThat(mHearingAidPreference.getSummary()).isEqualTo(TEST_DEVICE_NAME);
|
assertThat(mHearingAidPreference.getSummary().toString().contentEquals(
|
||||||
|
"TEST_HEARING_AID_BT_DEVICE_NAME, right only")).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onHearingAidStateChanged_disconnected_updateHearingAidSummary() {
|
public void getSummary_connectedHearingAidBothSide_connectedBothSideSummary() {
|
||||||
|
when(mCachedBluetoothDevice.getDeviceSide()).thenReturn(
|
||||||
|
HearingAidProfile.DeviceSide.SIDE_LEFT);
|
||||||
|
when(mCachedSubBluetoothDevice.isConnected()).thenReturn(true);
|
||||||
|
when(mCachedBluetoothDevice.getSubDevice()).thenReturn(mCachedSubBluetoothDevice);
|
||||||
|
when(mHearingAidProfile.getConnectedDevices()).thenReturn(generateHearingAidDeviceList());
|
||||||
|
mPreferenceController.onStart();
|
||||||
|
Intent intent = new Intent(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
|
||||||
|
intent.putExtra(BluetoothHearingAid.EXTRA_STATE, BluetoothHearingAid.STATE_CONNECTED);
|
||||||
|
sendIntent(intent);
|
||||||
|
|
||||||
|
assertThat(mHearingAidPreference.getSummary().toString().contentEquals(
|
||||||
|
"TEST_HEARING_AID_BT_DEVICE_NAME, left and right")).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getSummary_connectedMultipleHearingAids_connectedBothSideSummary() {
|
||||||
|
when(mCachedBluetoothDevice.getDeviceSide()).thenReturn(
|
||||||
|
HearingAidProfile.DeviceSide.SIDE_LEFT);
|
||||||
|
when(mCachedSubBluetoothDevice.isConnected()).thenReturn(true);
|
||||||
|
when(mCachedBluetoothDevice.getSubDevice()).thenReturn(mCachedSubBluetoothDevice);
|
||||||
|
when(mHearingAidProfile.getConnectedDevices()).thenReturn(
|
||||||
|
generateMultipleHearingAidDeviceList());
|
||||||
|
mPreferenceController.onStart();
|
||||||
|
Intent intent = new Intent(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
|
||||||
|
intent.putExtra(BluetoothHearingAid.EXTRA_STATE, BluetoothHearingAid.STATE_CONNECTED);
|
||||||
|
sendIntent(intent);
|
||||||
|
|
||||||
|
assertThat(mHearingAidPreference.getSummary().toString().contentEquals(
|
||||||
|
"TEST_HEARING_AID_BT_DEVICE_NAME +1 more")).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getSummary_disconnectedHearingAid_disconnectedSummary() {
|
||||||
mPreferenceController.onStart();
|
mPreferenceController.onStart();
|
||||||
Intent intent = new Intent(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
|
Intent intent = new Intent(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
|
||||||
intent.putExtra(BluetoothHearingAid.EXTRA_STATE, BluetoothHearingAid.STATE_DISCONNECTED);
|
intent.putExtra(BluetoothHearingAid.EXTRA_STATE, BluetoothHearingAid.STATE_DISCONNECTED);
|
||||||
@@ -133,7 +167,7 @@ public class AccessibilityHearingAidPreferenceControllerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onBluetoothStateChanged_bluetoothOff_updateHearingAidSummary() {
|
public void getSummary_bluetoothOff_disconnectedSummary() {
|
||||||
mPreferenceController.onStart();
|
mPreferenceController.onStart();
|
||||||
Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
|
Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
|
||||||
intent.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_OFF);
|
intent.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_OFF);
|
||||||
@@ -168,19 +202,14 @@ public class AccessibilityHearingAidPreferenceControllerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onNotSupportHearingAidProfile_doNotDoReceiverOperation() {
|
public void onNotSupportHearingAidProfile_isNotAvailable() {
|
||||||
//clear bluetooth supported profile
|
//clear bluetooth supported profile
|
||||||
mShadowBluetoothAdapter.clearSupportedProfiles();
|
mShadowBluetoothAdapter.clearSupportedProfiles();
|
||||||
mPreferenceController = new AccessibilityHearingAidPreferenceController(mContext,
|
mPreferenceController = new AccessibilityHearingAidPreferenceController(mContext,
|
||||||
HEARING_AID_PREFERENCE);
|
HEARING_AID_PREFERENCE);
|
||||||
mPreferenceController.setPreference(mHearingAidPreference);
|
mPreferenceController.setPreference(mHearingAidPreference);
|
||||||
//not call registerReceiver()
|
|
||||||
mPreferenceController.onStart();
|
|
||||||
verify(mContext, never()).registerReceiver(any(), any());
|
|
||||||
|
|
||||||
//not call unregisterReceiver()
|
assertThat(mPreferenceController.isAvailable()).isFalse();
|
||||||
mPreferenceController.onStop();
|
|
||||||
verify(mContext, never()).unregisterReceiver(any());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -224,4 +253,11 @@ public class AccessibilityHearingAidPreferenceControllerTest {
|
|||||||
deviceList.add(mBluetoothDevice);
|
deviceList.add(mBluetoothDevice);
|
||||||
return deviceList;
|
return deviceList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private List<BluetoothDevice> generateMultipleHearingAidDeviceList() {
|
||||||
|
final List<BluetoothDevice> deviceList = new ArrayList<>(2);
|
||||||
|
deviceList.add(mBluetoothDevice);
|
||||||
|
deviceList.add(mBluetoothDevice);
|
||||||
|
return deviceList;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user