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

Allow connected Hearing Aid devices to be searched by names

Browse Source 
Bug: 353847080
Test: atest AvailableHearingDevicePreferenceControllerTest
Flag: com.android.settings.accessibility.fix_a11y_settings_search
Change-Id: I634c5ce7b31ae5d7f78a006b9cedc0725794482a
This commit is contained in:
Candice
2024-10-29 08:34:51 +00:00
parent 898d1e07ad
commit db622c1aea
3 changed files with 172 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/com/android/settings/accessibility/AvailableHearingDevicePreferenceController.java
View File

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

11
src/com/android/settings/accessibility/AvailableHearingDeviceUpdater.java
View File

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