Merge changes from topic "hearingAidsInT" into tm-dev
* changes:
Add 'Live Caption' preference for hearing aids device in Device details page
Update summary in Accessibility -> Hearing aids
Header for hearing aids now listed in one summary
diff --git a/res/xml/bluetooth_device_details_fragment.xml b/res/xml/bluetooth_device_details_fragment.xml
index b44a93d..f330b19 100644
--- a/res/xml/bluetooth_device_details_fragment.xml
+++ b/res/xml/bluetooth_device_details_fragment.xml
@@ -66,6 +66,18 @@
<PreferenceCategory
android:key="bluetooth_profiles"/>
+ <PreferenceCategory
+ android:key="bluetooth_related_tools"
+ android:title="@string/bluetooth_screen_related">
+ <Preference
+ android:key="live_caption"
+ android:icon="@drawable/ic_live_caption"
+ android:persistent="false"
+ android:summary="@string/live_caption_summary"
+ android:title="@string/live_caption_title"
+ settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>
+ </PreferenceCategory>
+
<com.android.settingslib.widget.FooterPreference
android:key="device_details_footer"
android:selectable="false"
diff --git a/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
index 8f0ca3e..2cb7426 100644
--- a/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
@@ -39,12 +39,13 @@
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
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.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.FutureTask;
@@ -82,15 +83,13 @@
private final LocalBluetoothManager mLocalBluetoothManager;
private final BluetoothAdapter mBluetoothAdapter;
- //cache value of supporting hearing aid or not
- private boolean mHearingAidProfileSupported;
+
private FragmentManager mFragmentManager;
public AccessibilityHearingAidPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mLocalBluetoothManager = getLocalBluetoothManager();
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
- mHearingAidProfileSupported = isHearingAidProfileSupported();
}
@Override
@@ -101,29 +100,25 @@
@Override
public int getAvailabilityStatus() {
- return mHearingAidProfileSupported ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ return isHearingAidProfileSupported() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public void onStart() {
- if (mHearingAidProfileSupported) {
- IntentFilter filter = new IntentFilter();
- filter.addAction(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
- filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
- mContext.registerReceiver(mHearingAidChangedReceiver, filter);
- }
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
+ filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
+ mContext.registerReceiver(mHearingAidChangedReceiver, filter);
}
@Override
public void onStop() {
- if (mHearingAidProfileSupported) {
- mContext.unregisterReceiver(mHearingAidChangedReceiver);
- }
+ mContext.unregisterReceiver(mHearingAidChangedReceiver);
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
- if (TextUtils.equals(preference.getKey(), getPreferenceKey())){
+ if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
final CachedBluetoothDevice device = getConnectedHearingAidDevice();
if (device == null) {
launchHearingAidInstructionDialog();
@@ -141,7 +136,27 @@
if (device == null) {
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) {
@@ -150,33 +165,44 @@
@VisibleForTesting
CachedBluetoothDevice getConnectedHearingAidDevice() {
- if (!mHearingAidProfileSupported) {
+ if (!isHearingAidProfileSupported()) {
return null;
}
- if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) {
- return null;
- }
- final List<BluetoothDevice> deviceList = mLocalBluetoothManager.getProfileManager()
- .getHearingAidProfile().getConnectedDevices();
- final Iterator it = deviceList.iterator();
- while (it.hasNext()) {
- BluetoothDevice obj = (BluetoothDevice)it.next();
- if (!mLocalBluetoothManager.getCachedDeviceManager().isSubDevice(obj)) {
- return mLocalBluetoothManager.getCachedDeviceManager().findDevice(obj);
+
+ final CachedBluetoothDeviceManager deviceManager =
+ mLocalBluetoothManager.getCachedDeviceManager();
+ final HearingAidProfile hearingAidProfile =
+ mLocalBluetoothManager.getProfileManager().getHearingAidProfile();
+ final List<BluetoothDevice> deviceList = hearingAidProfile.getConnectedDevices();
+ for (BluetoothDevice obj : deviceList) {
+ if (!deviceManager.isSubDevice(obj)) {
+ return deviceManager.findDevice(obj);
}
}
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() {
if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) {
return false;
}
final List<Integer> supportedList = mBluetoothAdapter.getSupportedProfiles();
- if (supportedList.contains(BluetoothProfile.HEARING_AID)) {
- return true;
- }
- return false;
+ return supportedList.contains(BluetoothProfile.HEARING_AID);
}
private LocalBluetoothManager getLocalBluetoothManager() {
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
index 9c7aa58..06a71f0 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
@@ -75,10 +75,8 @@
if (TextUtils.isEmpty(summaryText)) {
// If first summary is unavailable, not to show second summary.
mHeaderController.setSecondSummary((CharSequence)null);
- } else {
- // If both the hearing aids are connected, two device status should be shown.
- mHeaderController.setSecondSummary(mDeviceManager.getSubDeviceSummary(mCachedDevice));
}
+
mHeaderController.setLabel(mCachedDevice.getName());
mHeaderController.setIcon(pair.first);
mHeaderController.setIconContentDescription(pair.second);
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsRelatedToolsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsRelatedToolsController.java
new file mode 100644
index 0000000..71d6049
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsRelatedToolsController.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+
+import android.content.Context;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+/**
+ * This class adds related tools preference.
+ */
+public class BluetoothDetailsRelatedToolsController extends BluetoothDetailsController{
+ private static final String KEY_RELATED_TOOLS_GROUP = "bluetooth_related_tools";
+ private static final String KEY_LIVE_CAPTION = "live_caption";
+
+ public BluetoothDetailsRelatedToolsController(Context context,
+ PreferenceFragmentCompat fragment, CachedBluetoothDevice device, Lifecycle lifecycle) {
+ super(context, fragment, device, lifecycle);
+ lifecycle.addObserver(this);
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return mCachedDevice.isHearingAidDevice();
+ }
+
+ @Override
+ protected void init(PreferenceScreen screen) {
+ if (!mCachedDevice.isHearingAidDevice()) {
+ return;
+ }
+
+ final PreferenceCategory preferenceCategory = screen.findPreference(getPreferenceKey());
+ final Preference liveCaptionPreference = screen.findPreference(KEY_LIVE_CAPTION);
+ if (!liveCaptionPreference.isVisible()) {
+ preferenceCategory.removePreference(liveCaptionPreference);
+ }
+
+ if (preferenceCategory.getPreferenceCount() == 0) {
+ screen.removePreference(preferenceCategory);
+ }
+ }
+
+ @Override
+ protected void refresh() {}
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_RELATED_TOOLS_GROUP;
+ }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index fdf0f38..ca212f3 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -246,6 +246,8 @@
mCachedDevice, lifecycle));
controllers.add(new BluetoothDetailsMacAddressController(context, this, mCachedDevice,
lifecycle));
+ controllers.add(new BluetoothDetailsRelatedToolsController(context, this, mCachedDevice,
+ lifecycle));
}
return controllers;
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
index a455648..1b8c8c3 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
@@ -18,9 +18,7 @@
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.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -48,7 +46,6 @@
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -63,7 +60,6 @@
import java.util.List;
@RunWith(RobolectricTestRunner.class)
-@Ignore
@Config(shadows = {ShadowBluetoothAdapter.class, ShadowBluetoothUtils.class})
public class AccessibilityHearingAidPreferenceControllerTest {
private static final String TEST_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1";
@@ -82,6 +78,8 @@
@Mock
private CachedBluetoothDevice mCachedBluetoothDevice;
@Mock
+ private CachedBluetoothDevice mCachedSubBluetoothDevice;
+ @Mock
private CachedBluetoothDeviceManager mCachedDeviceManager;
@Mock
private LocalBluetoothManager mLocalBluetoothManager;
@@ -111,18 +109,54 @@
}
@Test
- public void onHearingAidStateChanged_connected_updateHearingAidSummary() {
+ public void getSummary_connectedHearingAidRightSide_connectedRightSideSummary() {
+ when(mCachedBluetoothDevice.getDeviceSide()).thenReturn(
+ HearingAidProfile.DeviceSide.SIDE_RIGHT);
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()).isEqualTo(TEST_DEVICE_NAME);
+ assertThat(mHearingAidPreference.getSummary().toString().contentEquals(
+ "TEST_HEARING_AID_BT_DEVICE_NAME, right only")).isTrue();
}
@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();
Intent intent = new Intent(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
intent.putExtra(BluetoothHearingAid.EXTRA_STATE, BluetoothHearingAid.STATE_DISCONNECTED);
@@ -133,7 +167,7 @@
}
@Test
- public void onBluetoothStateChanged_bluetoothOff_updateHearingAidSummary() {
+ public void getSummary_bluetoothOff_disconnectedSummary() {
mPreferenceController.onStart();
Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
intent.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_OFF);
@@ -168,19 +202,14 @@
}
@Test
- public void onNotSupportHearingAidProfile_doNotDoReceiverOperation() {
+ public void onNotSupportHearingAidProfile_isNotAvailable() {
//clear bluetooth supported profile
mShadowBluetoothAdapter.clearSupportedProfiles();
mPreferenceController = new AccessibilityHearingAidPreferenceController(mContext,
HEARING_AID_PREFERENCE);
mPreferenceController.setPreference(mHearingAidPreference);
- //not call registerReceiver()
- mPreferenceController.onStart();
- verify(mContext, never()).registerReceiver(any(), any());
- //not call unregisterReceiver()
- mPreferenceController.onStop();
- verify(mContext, never()).unregisterReceiver(any());
+ assertThat(mPreferenceController.isAvailable()).isFalse();
}
@Test
@@ -224,4 +253,11 @@
deviceList.add(mBluetoothDevice);
return deviceList;
}
+
+ private List<BluetoothDevice> generateMultipleHearingAidDeviceList() {
+ final List<BluetoothDevice> deviceList = new ArrayList<>(2);
+ deviceList.add(mBluetoothDevice);
+ deviceList.add(mBluetoothDevice);
+ return deviceList;
+ }
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsRelatedToolsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsRelatedToolsControllerTest.java
new file mode 100644
index 0000000..2035f06
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsRelatedToolsControllerTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link BluetoothDetailsRelatedToolsController}. */
+@RunWith(RobolectricTestRunner.class)
+public class BluetoothDetailsRelatedToolsControllerTest extends BluetoothDetailsControllerTestBase {
+ private BluetoothDetailsRelatedToolsController mController;
+
+ @Override
+ public void setUp() {
+ super.setUp();
+ mController = new BluetoothDetailsRelatedToolsController(mContext, mFragment, mCachedDevice,
+ mLifecycle);
+ }
+
+ @Test
+ public void isAvailable_isHearingAidDevice_available() {
+ when(mCachedDevice.isHearingAidDevice()).thenReturn(true);
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_notHearingAidDevice_notAvailable() {
+ when(mCachedDevice.isHearingAidDevice()).thenReturn(false);
+
+ assertThat(mController.isAvailable()).isFalse();
+ }
+}