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

Allow saved Hearing Aid devices to be searched by names

Browse Source 
Bug: 353847080
Test: atest SavedHearingDevicePreferenceControllerTest
Test: Manually. Add video to the bug
Flag: com.android.settings.accessibility.fix_a11y_settings_search
Change-Id: Ic20a74bf6ffa28a82eeb44a0651861d2ff22e246
This commit is contained in:
Candice
2024-10-29 08:31:00 +00:00
parent 48d984511a
commit 898d1e07ad
3 changed files with 175 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/com/android/settings/accessibility/SavedHearingDevicePreferenceController.java
View File

@@ -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<SearchIndexableRaw> 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);
}
}
}