From 772b19f6cafbb6a878b1dbe41594c45407cb0bb8 Mon Sep 17 00:00:00 2001 From: Abhishek Gadewar Date: Thu, 9 May 2024 22:54:00 -0700 Subject: [PATCH 1/5] fix crash in setting time zone Summary: Fix a NPE when trying to set the time zone. Test: Set the time zone. See it update without crashing. Change-Id: I01c394f1a682844babc8119c86348b140eeb18ec Signed-off-by: Abhishek Gadewar --- .../datetime/timezone/BaseTimeZonePicker.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java index adbedee7998..120d8ca7391 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java @@ -164,7 +164,9 @@ public abstract class BaseTimeZonePicker extends InstrumentedFragment @Override public boolean onMenuItemActionExpand(MenuItem item) { // To prevent a large space on tool bar. - mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/); + if (mAppBarLayout != null) { + mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/); + } // To prevent user can expand the collapsing tool bar view. ViewCompat.setNestedScrollingEnabled(mRecyclerView, false); return true; @@ -173,7 +175,9 @@ public abstract class BaseTimeZonePicker extends InstrumentedFragment @Override public boolean onMenuItemActionCollapse(MenuItem item) { // We keep the collapsed status after user cancel the search function. - mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/); + if (mAppBarLayout != null) { + mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/); + } ViewCompat.setNestedScrollingEnabled(mRecyclerView, true); return true; } @@ -196,6 +200,10 @@ public abstract class BaseTimeZonePicker extends InstrumentedFragment } private void autoSetCollapsingToolbarLayoutScrolling() { + if (mAppBarLayout == null) { + return; + } + CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) mAppBarLayout.getLayoutParams(); AppBarLayout.Behavior behavior = new AppBarLayout.Behavior(); From dba15f821f0b6e39d1f4d7a826af760be6a2df85 Mon Sep 17 00:00:00 2001 From: shaoweishen Date: Fri, 18 Oct 2024 02:42:08 +0000 Subject: [PATCH 2/5] [PhysicalKeyboard] Update Setting Feature Provider for follow up usage rename method in provider and usage, the provider is not activated now, this change will not have impact on current feature. Bug: 369937888 Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/inputmethod/ Flag: NONE, rename method, no effect on current feature. Change-Id: I1bb66b106c338a8a8730bbd9163d6a921c17b9c0 --- .../KeyboardSettingsFeatureProvider.java | 15 ++++++++------- .../KeyboardSettingsFeatureProviderImpl.java | 10 ++++++---- .../inputmethod/PhysicalKeyboardFragment.java | 7 +++++-- .../KeyboardSettingsFeatureProviderImplTest.java | 14 -------------- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProvider.java b/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProvider.java index 72551074148..4233ce21877 100644 --- a/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProvider.java +++ b/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProvider.java @@ -35,20 +35,21 @@ public interface KeyboardSettingsFeatureProvider { boolean supportsFirmwareUpdate(); /** - * Add firmware update preference category . + * Register firmware information preferences update on preference screen. * - * @param context The context to initialize the application with. - * @param screen The {@link PreferenceScreen} to add the firmware update preference category. - * - * @return true if the category is added successfully. + * @param screen The {@link PreferenceScreen} to add the firmware information preferences. */ - boolean addFirmwareUpdateCategory(Context context, PreferenceScreen screen); + void registerKeyboardInformationCategory(@Nullable PreferenceScreen screen); + + /** + * Unregister firmware information preferences update on preference screen. + */ + void unregisterKeyboardInformationCategory(); /** * Get custom action key icon. * * @param context Context for accessing resources. - * * @return Returns the image of the icon, or null if there is no any custom icon. */ @Nullable diff --git a/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImpl.java b/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImpl.java index 26b10e585e1..b6cc774fb80 100644 --- a/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImpl.java +++ b/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImpl.java @@ -19,6 +19,7 @@ package com.android.settings.inputmethod; import android.content.Context; import android.graphics.drawable.Drawable; +import androidx.annotation.Nullable; import androidx.preference.PreferenceScreen; /** @@ -32,12 +33,13 @@ public class KeyboardSettingsFeatureProviderImpl implements KeyboardSettingsFeat } @Override - public boolean addFirmwareUpdateCategory(Context context, PreferenceScreen screen) { - return false; - } + public void registerKeyboardInformationCategory(@Nullable PreferenceScreen screen) {} + + @Override + public void unregisterKeyboardInformationCategory() {} @Override public Drawable getActionKeyIcon(Context context) { return null; - }; + } } diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index edc99897a70..910a1d6e845 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -164,7 +164,7 @@ public final class PhysicalKeyboardFragment extends DashboardFragment mFeatureProvider = featureFactory.getKeyboardSettingsFeatureProvider(); mSupportsFirmwareUpdate = mFeatureProvider.supportsFirmwareUpdate(); if (mSupportsFirmwareUpdate) { - mFeatureProvider.addFirmwareUpdateCategory(getContext(), getPreferenceScreen()); + mFeatureProvider.registerKeyboardInformationCategory(getPreferenceScreen()); } boolean isModifierKeySettingsEnabled = FeatureFlagUtils .isEnabled(getContext(), FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_MODIFIER_KEY); @@ -344,7 +344,7 @@ public final class PhysicalKeyboardFragment extends DashboardFragment mKeyboardAssistanceCategory.setOrder(1); preferenceScreen.addPreference(mKeyboardAssistanceCategory); if (mSupportsFirmwareUpdate) { - mFeatureProvider.addFirmwareUpdateCategory(getPrefContext(), preferenceScreen); + mFeatureProvider.registerKeyboardInformationCategory(preferenceScreen); } if (InputSettings.isAccessibilityBounceKeysFeatureEnabled() @@ -423,6 +423,9 @@ public final class PhysicalKeyboardFragment extends DashboardFragment private void unregisterSettingsObserver() { getActivity().getContentResolver().unregisterContentObserver(mContentObserver); + if (mSupportsFirmwareUpdate) { + mFeatureProvider.unregisterKeyboardInformationCategory(); + } } private void updateAccessibilityBounceKeysSwitch(@NonNull Context context) { diff --git a/tests/unit/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImplTest.java b/tests/unit/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImplTest.java index 6675d5a27c4..3faa52e6fb9 100644 --- a/tests/unit/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImplTest.java +++ b/tests/unit/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImplTest.java @@ -19,10 +19,7 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.os.Looper; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -47,17 +44,6 @@ public class KeyboardSettingsFeatureProviderImplTest { assertThat(mFeatureProvider.supportsFirmwareUpdate()).isFalse(); } - @Test - public void addFirmwareUpdateCategory_defaultValue_returnsFalse() { - if (Looper.myLooper() == null) { - Looper.prepare(); - } - PreferenceManager preferenceManager = new PreferenceManager(mContext); - PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext); - - assertThat(mFeatureProvider.addFirmwareUpdateCategory(mContext, screen)).isFalse(); - } - @Test public void getActionKeyIcon_defaultValue_returnsNull() { assertThat(mFeatureProvider.getActionKeyIcon(mContext)).isNull(); From 400d90a0f614f6e5757658f60658438898f3a362 Mon Sep 17 00:00:00 2001 From: Riley Jones Date: Fri, 1 Nov 2024 03:05:04 +0000 Subject: [PATCH 3/5] Fixes searchability for timeout settings page. Bug: 352634232 Test: Manually install & veryfy conditions described in above bug Flag: EXEMPT xml-only change Change-Id: If0002a649952f45514d2e2971d742bb4cc1e1191 --- .../accessibility_control_timeout_settings.xml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/res/xml/accessibility_control_timeout_settings.xml b/res/xml/accessibility_control_timeout_settings.xml index 4f1c2b3f44f..4c65d897063 100644 --- a/res/xml/accessibility_control_timeout_settings.xml +++ b/res/xml/accessibility_control_timeout_settings.xml @@ -22,35 +22,46 @@ + android:title="@string/accessibility_control_timeout_preference_intro_text" + settings:searchable="false"/> + + settings:searchable="false" + settings:controller="com.android.settings.accessibility.AccessibilityTimeoutController" /> + + + + Date: Tue, 29 Oct 2024 08:31:00 +0000 Subject: [PATCH 4/5] Allow saved Hearing Aid devices to be searched by names Bug: 353847080 Test: atest SavedHearingDevicePreferenceControllerTest Test: Manually. Add video to the bug Flag: com.android.settings.accessibility.fix_a11y_settings_search Change-Id: Ic20a74bf6ffa28a82eeb44a0651861d2ff22e246 --- ...avedHearingDevicePreferenceController.java | 51 ++++++++ .../SavedHearingDeviceUpdater.java | 10 +- ...HearingDevicePreferenceControllerTest.java | 118 ++++++++++++++++++ 3 files changed, 175 insertions(+), 4 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/accessibility/SavedHearingDevicePreferenceControllerTest.java diff --git a/src/com/android/settings/accessibility/SavedHearingDevicePreferenceController.java b/src/com/android/settings/accessibility/SavedHearingDevicePreferenceController.java index 20e227c48bf..c6f51412adf 100644 --- a/src/com/android/settings/accessibility/SavedHearingDevicePreferenceController.java +++ b/src/com/android/settings/accessibility/SavedHearingDevicePreferenceController.java @@ -17,17 +17,26 @@ package com.android.settings.accessibility; import android.content.Context; +import android.util.Log; +import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.bluetooth.BluetoothDeviceUpdater; +import com.android.settings.bluetooth.Utils; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import com.android.settingslib.search.SearchIndexableRaw; + +import java.util.List; /** * Controller to update the {@link androidx.preference.PreferenceCategory} for all @@ -39,11 +48,23 @@ public class SavedHearingDevicePreferenceController extends BaseBluetoothDevicePreferenceController implements LifecycleObserver, OnStart, OnResume, OnStop { + private static final String TAG = "SavedHearingDevicePreferenceController"; + private static final String SEARCH_DATA_KEY_PREFIX = "a11y_saved_hearing_device"; private BluetoothDeviceUpdater mSavedHearingDeviceUpdater; + private final LocalBluetoothManager mLocalBluetoothManager; public SavedHearingDevicePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); + mLocalBluetoothManager = Utils.getLocalBluetoothManager(context); + } + + @VisibleForTesting + void init(SavedHearingDeviceUpdater savedHearingDeviceUpdater) { + if (mSavedHearingDeviceUpdater != null) { + throw new IllegalStateException("Should not call init() more than 1 time."); + } + mSavedHearingDeviceUpdater = savedHearingDeviceUpdater; } /** @@ -86,4 +107,34 @@ public class SavedHearingDevicePreferenceController extends mSavedHearingDeviceUpdater.forceUpdate(); } } + + @Override + public void updateDynamicRawDataToIndex(List rawData) { + if (Flags.fixA11ySettingsSearch()) { + if (mLocalBluetoothManager == null) { + Log.d(TAG, "Bluetooth is not supported"); + return; + } + + for (CachedBluetoothDevice cachedDevice : + mLocalBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy()) { + + if (!SavedHearingDeviceUpdater.isSavedHearingAidDevice(cachedDevice)) { + continue; + } + + SearchIndexableRaw data = new SearchIndexableRaw(mContext); + // Include the identity address and add prefix to ensure the key is unique and + // distinguish from Bluetooth's connected devices. + data.key = SEARCH_DATA_KEY_PREFIX + + cachedDevice.getName() + cachedDevice.getIdentityAddress(); + data.title = cachedDevice.getName(); + data.summaryOn = mContext.getString(R.string.accessibility_hearingaid_title); + data.screenTitle = mContext.getString(R.string.accessibility_hearingaid_title); + rawData.add(data); + } + } else { + super.updateDynamicRawDataToIndex(rawData); + } + } } diff --git a/src/com/android/settings/accessibility/SavedHearingDeviceUpdater.java b/src/com/android/settings/accessibility/SavedHearingDeviceUpdater.java index 1de9c727235..2d42fb9942e 100644 --- a/src/com/android/settings/accessibility/SavedHearingDeviceUpdater.java +++ b/src/com/android/settings/accessibility/SavedHearingDeviceUpdater.java @@ -36,14 +36,16 @@ public class SavedHearingDeviceUpdater extends SavedBluetoothDeviceUpdater { super(context, devicePreferenceCallback, /* showConnectedDevice= */ false, metricsCategory); } - @Override - public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) { + static boolean isSavedHearingAidDevice(CachedBluetoothDevice cachedDevice) { final BluetoothDevice device = cachedDevice.getDevice(); - final boolean isSavedHearingAidDevice = cachedDevice.isHearingAidDevice() + return cachedDevice.isHearingAidDevice() && device.getBondState() == BluetoothDevice.BOND_BONDED && !device.isConnected(); + } - return isSavedHearingAidDevice && isDeviceInCachedDevicesList(cachedDevice); + @Override + public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) { + return isSavedHearingAidDevice(cachedDevice) && isDeviceInCachedDevicesList(cachedDevice); } @Override diff --git a/tests/robotests/src/com/android/settings/accessibility/SavedHearingDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/SavedHearingDevicePreferenceControllerTest.java new file mode 100644 index 00000000000..1e548353ab6 --- /dev/null +++ b/tests/robotests/src/com/android/settings/accessibility/SavedHearingDevicePreferenceControllerTest.java @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2024 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.accessibility; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.when; + +import android.bluetooth.BluetoothDevice; +import android.content.Context; +import android.platform.test.annotations.EnableFlags; +import android.platform.test.flag.junit.SetFlagsRule; + +import androidx.test.core.app.ApplicationProvider; + +import com.android.settings.bluetooth.Utils; +import com.android.settings.testutils.shadow.ShadowBluetoothUtils; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; +import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.search.SearchIndexableRaw; + +import com.google.common.collect.ImmutableList; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; + +import java.util.ArrayList; +import java.util.List; + +/** Tests for {@link SavedHearingDevicePreferenceController} */ +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowBluetoothUtils.class}) +public class SavedHearingDevicePreferenceControllerTest { + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); + + private static final String PREFERENCE_KEY = "preference_key"; + private static final String DEVICE_NAME = "device"; + + private Context mContext; + private SavedHearingDevicePreferenceController mSavedHearingDevicePreferenceController; + @Mock + private SavedHearingDeviceUpdater mSavedHearingDeviceUpdater; + @Mock + private CachedBluetoothDeviceManager mCachedDeviceManager; + @Mock + private LocalBluetoothManager mLocalBluetoothManager; + @Mock + private CachedBluetoothDevice mCachedDevice; + @Mock + private BluetoothDevice mDevice; + + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + mContext = ApplicationProvider.getApplicationContext(); + ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager; + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); + when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager); + when(mCachedDevice.getDevice()).thenReturn(mDevice); + when(mCachedDevice.getName()).thenReturn(DEVICE_NAME); + when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn( + ImmutableList.of(mCachedDevice)); + + mSavedHearingDevicePreferenceController = + new SavedHearingDevicePreferenceController(mContext, PREFERENCE_KEY); + mSavedHearingDevicePreferenceController.init(mSavedHearingDeviceUpdater); + } + + @Test + @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) + public void updateDynamicRawDataToIndex_isNotHearingAidDevice_deviceIsNotSearchable() { + when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED); + when(mDevice.isConnected()).thenReturn(false); + when(mCachedDevice.isHearingAidDevice()).thenReturn(false); + List searchData = new ArrayList<>(); + + mSavedHearingDevicePreferenceController.updateDynamicRawDataToIndex(searchData); + + assertThat(searchData).isEmpty(); + } + + @Test + @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) + public void updateDynamicRawDataToIndex_isHearingAidDevice_deviceIsSearchable() { + when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED); + when(mDevice.isConnected()).thenReturn(false); + when(mCachedDevice.isHearingAidDevice()).thenReturn(true); + List searchData = new ArrayList<>(); + + mSavedHearingDevicePreferenceController.updateDynamicRawDataToIndex(searchData); + + assertThat(searchData).isNotEmpty(); + assertThat(searchData.get(0).key).contains(DEVICE_NAME); + } +} From db622c1aea64d09b3d34c948a2f0b6405f64896d Mon Sep 17 00:00:00 2001 From: Candice Date: Tue, 29 Oct 2024 08:34:51 +0000 Subject: [PATCH 5/5] Allow connected Hearing Aid devices to be searched by names Bug: 353847080 Test: atest AvailableHearingDevicePreferenceControllerTest Flag: com.android.settings.accessibility.fix_a11y_settings_search Change-Id: I634c5ce7b31ae5d7f78a006b9cedc0725794482a --- ...ableHearingDevicePreferenceController.java | 45 +++++++ .../AvailableHearingDeviceUpdater.java | 11 +- ...HearingDevicePreferenceControllerTest.java | 118 ++++++++++++++++++ 3 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceControllerTest.java diff --git a/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceController.java b/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceController.java index c8692a1f28c..6d7846918db 100644 --- a/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceController.java +++ b/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceController.java @@ -18,11 +18,14 @@ package com.android.settings.accessibility; import android.bluetooth.BluetoothProfile; import android.content.Context; +import android.util.Log; +import androidx.annotation.VisibleForTesting; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; @@ -32,6 +35,9 @@ 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 com.android.settingslib.search.SearchIndexableRaw; + +import java.util.List; /** * Controller to update the {@link androidx.preference.PreferenceCategory} for all @@ -44,6 +50,7 @@ public class AvailableHearingDevicePreferenceController extends BluetoothCallback { private static final String TAG = "AvailableHearingDevicePreferenceController"; + private static final String SEARCH_DATA_KEY_PREFIX = "a11y_available_hearing_device"; private BluetoothDeviceUpdater mAvailableHearingDeviceUpdater; private final LocalBluetoothManager mLocalBluetoothManager; @@ -56,6 +63,14 @@ public class AvailableHearingDevicePreferenceController extends context); } + @VisibleForTesting + void init(AvailableHearingDeviceUpdater availableHearingDeviceUpdater) { + if (mAvailableHearingDeviceUpdater != null) { + throw new IllegalStateException("Should not call init() more than 1 time."); + } + mAvailableHearingDeviceUpdater = availableHearingDeviceUpdater; + } + /** * Initializes objects in this controller. Need to call this before onStart(). * @@ -107,4 +122,34 @@ public class AvailableHearingDevicePreferenceController extends getMetricsCategory()); } } + + @Override + public void updateDynamicRawDataToIndex(List rawData) { + if (Flags.fixA11ySettingsSearch()) { + if (mLocalBluetoothManager == null) { + Log.d(TAG, "Bluetooth is not supported"); + return; + } + + for (CachedBluetoothDevice cachedDevice : + mLocalBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy()) { + + if (!AvailableHearingDeviceUpdater.isAvailableHearingDevice(cachedDevice)) { + continue; + } + + SearchIndexableRaw data = new SearchIndexableRaw(mContext); + // Include the identity address and add prefix to ensure the key is unique and + // distinguish from Bluetooth's connected devices. + data.key = SEARCH_DATA_KEY_PREFIX + + cachedDevice.getName() + cachedDevice.getIdentityAddress(); + data.title = cachedDevice.getName(); + data.summaryOn = mContext.getString(R.string.accessibility_hearingaid_title); + data.screenTitle = mContext.getString(R.string.accessibility_hearingaid_title); + rawData.add(data); + } + } else { + super.updateDynamicRawDataToIndex(rawData); + } + } } diff --git a/src/com/android/settings/accessibility/AvailableHearingDeviceUpdater.java b/src/com/android/settings/accessibility/AvailableHearingDeviceUpdater.java index 31d069afaee..b11e328ac4c 100644 --- a/src/com/android/settings/accessibility/AvailableHearingDeviceUpdater.java +++ b/src/com/android/settings/accessibility/AvailableHearingDeviceUpdater.java @@ -16,6 +16,7 @@ package com.android.settings.accessibility; +import android.bluetooth.BluetoothDevice; import android.content.Context; import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater; @@ -34,10 +35,16 @@ public class AvailableHearingDeviceUpdater extends AvailableMediaBluetoothDevice super(context, devicePreferenceCallback, metricsCategory); } + static boolean isAvailableHearingDevice(CachedBluetoothDevice cachedDevice) { + final BluetoothDevice device = cachedDevice.getDevice(); + return cachedDevice.isHearingAidDevice() + && device.getBondState() == BluetoothDevice.BOND_BONDED + && device.isConnected(); + } + @Override public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) { - return cachedDevice.isHearingAidDevice() - && isDeviceConnected(cachedDevice) + return isAvailableHearingDevice(cachedDevice) && isDeviceInCachedDevicesList(cachedDevice); } diff --git a/tests/robotests/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceControllerTest.java new file mode 100644 index 00000000000..8989d4acb81 --- /dev/null +++ b/tests/robotests/src/com/android/settings/accessibility/AvailableHearingDevicePreferenceControllerTest.java @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2024 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.accessibility; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.when; + +import android.bluetooth.BluetoothDevice; +import android.content.Context; +import android.platform.test.annotations.EnableFlags; +import android.platform.test.flag.junit.SetFlagsRule; + +import androidx.test.core.app.ApplicationProvider; + +import com.android.settings.bluetooth.Utils; +import com.android.settings.testutils.shadow.ShadowBluetoothUtils; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; +import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.search.SearchIndexableRaw; + +import com.google.common.collect.ImmutableList; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; + +import java.util.ArrayList; +import java.util.List; + +/** Tests for {@link AvailableHearingDevicePreferenceController} */ +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowBluetoothUtils.class}) +public class AvailableHearingDevicePreferenceControllerTest { + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); + + private static final String PREFERENCE_KEY = "preference_key"; + private static final String DEVICE_NAME = "device"; + + private Context mContext; + private AvailableHearingDevicePreferenceController mAvailableHearingDevicePreferenceController; + @Mock + private AvailableHearingDeviceUpdater mAvailableHearingDeviceUpdater; + @Mock + private CachedBluetoothDeviceManager mCachedDeviceManager; + @Mock + private LocalBluetoothManager mLocalBluetoothManager; + @Mock + private CachedBluetoothDevice mCachedDevice; + @Mock + private BluetoothDevice mDevice; + + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + mContext = ApplicationProvider.getApplicationContext(); + ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager; + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); + when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager); + when(mCachedDevice.getDevice()).thenReturn(mDevice); + when(mCachedDevice.getName()).thenReturn(DEVICE_NAME); + when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn( + ImmutableList.of(mCachedDevice)); + + mAvailableHearingDevicePreferenceController = + new AvailableHearingDevicePreferenceController(mContext, PREFERENCE_KEY); + mAvailableHearingDevicePreferenceController.init(mAvailableHearingDeviceUpdater); + } + + @Test + @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) + public void updateDynamicRawDataToIndex_isNotHearingAidDevice_deviceIsNotSearchable() { + when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED); + when(mDevice.isConnected()).thenReturn(true); + when(mCachedDevice.isHearingAidDevice()).thenReturn(false); + List searchData = new ArrayList<>(); + + mAvailableHearingDevicePreferenceController.updateDynamicRawDataToIndex(searchData); + + assertThat(searchData).isEmpty(); + } + + @Test + @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) + public void updateDynamicRawDataToIndex_isHearingAidDevice_deviceIsSearchable() { + when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED); + when(mDevice.isConnected()).thenReturn(true); + when(mCachedDevice.isHearingAidDevice()).thenReturn(true); + List searchData = new ArrayList<>(); + + mAvailableHearingDevicePreferenceController.updateDynamicRawDataToIndex(searchData); + + assertThat(searchData).isNotEmpty(); + assertThat(searchData.get(0).key).contains(DEVICE_NAME); + } +}