[Pair hearing devices] Add "Saved devices" to show bonded but not connected hearing devices
* BaseHearingDevicePreferenceController will also be used in "Hearing devices", so extract to parent class first. Bug: 237625815 Test: make RunSettingsRoboTests ROBOTEST_FILTER="(SavedHearingDeviceUpdaterTest|BaseBluetoothDevicePreferenceControllerTest|BluetoothDeviceUpdaterTest|AvailableMediaBluetoothDeviceUpdaterTest|ConnectedBluetoothDeviceUpdaterTest|SavedBluetoothDeviceUpdaterTest)" Change-Id: I8a492866f48e3a664b9ff78bce5a4f082c0dc465
This commit is contained in:
@@ -27,6 +27,11 @@
|
|||||||
settings:userRestriction="no_config_bluetooth"
|
settings:userRestriction="no_config_bluetooth"
|
||||||
settings:useAdminDisabledSummary="true" />
|
settings:useAdminDisabledSummary="true" />
|
||||||
|
|
||||||
|
<PreferenceCategory
|
||||||
|
android:key="previously_connected_hearing_devices"
|
||||||
|
android:title="@string/accessibility_hearing_device_saved_title"
|
||||||
|
settings:controller="com.android.settings.accessibility.SavedHearingDevicePreferenceController"/>
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="device_control_category"
|
android:key="device_control_category"
|
||||||
android:title="@string/accessibility_hearing_device_control">
|
android:title="@string/accessibility_hearing_device_control">
|
||||||
|
@@ -19,6 +19,7 @@ package com.android.settings.accessibility;
|
|||||||
import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
|
import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
|
||||||
|
|
||||||
import android.content.ComponentName;
|
import android.content.ComponentName;
|
||||||
|
import android.content.Context;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
@@ -44,6 +45,12 @@ public class AccessibilityHearingAidsFragment extends AccessibilityShortcutPrefe
|
|||||||
super(DISALLOW_CONFIG_BLUETOOTH);
|
super(DISALLOW_CONFIG_BLUETOOTH);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAttach(Context context) {
|
||||||
|
super.onAttach(context);
|
||||||
|
use(SavedHearingDevicePreferenceController.class).init(this);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
mFeatureName = getContext().getString(R.string.accessibility_hearingaid_title);
|
mFeatureName = getContext().getString(R.string.accessibility_hearingaid_title);
|
||||||
|
@@ -0,0 +1,73 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 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 android.content.Context;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceCategory;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
||||||
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Abstract base class for bluetooth preference controller to handle UI logic, e.g. availability
|
||||||
|
* status, preference added, and preference removed.
|
||||||
|
*/
|
||||||
|
public abstract class BaseBluetoothDevicePreferenceController extends BasePreferenceController
|
||||||
|
implements DevicePreferenceCallback {
|
||||||
|
|
||||||
|
private PreferenceCategory mPreferenceCategory;
|
||||||
|
|
||||||
|
public BaseBluetoothDevicePreferenceController(Context context,
|
||||||
|
String preferenceKey) {
|
||||||
|
super(context, preferenceKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getAvailabilityStatus() {
|
||||||
|
return (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH))
|
||||||
|
? AVAILABLE
|
||||||
|
: CONDITIONALLY_UNAVAILABLE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void displayPreference(PreferenceScreen screen) {
|
||||||
|
super.displayPreference(screen);
|
||||||
|
|
||||||
|
mPreferenceCategory = screen.findPreference(getPreferenceKey());
|
||||||
|
mPreferenceCategory.setVisible(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDeviceAdded(Preference preference) {
|
||||||
|
if (mPreferenceCategory.getPreferenceCount() == 0) {
|
||||||
|
mPreferenceCategory.setVisible(true);
|
||||||
|
}
|
||||||
|
mPreferenceCategory.addPreference(preference);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDeviceRemoved(Preference preference) {
|
||||||
|
mPreferenceCategory.removePreference(preference);
|
||||||
|
if (mPreferenceCategory.getPreferenceCount() == 0) {
|
||||||
|
mPreferenceCategory.setVisible(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,89 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 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 android.content.Context;
|
||||||
|
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
|
||||||
|
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
||||||
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
|
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;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Controller to update the {@link androidx.preference.PreferenceCategory} for all
|
||||||
|
* saved ((bonded but not connected)) hearing devices, including ASHA and HAP profile.
|
||||||
|
* Parent class {@link BaseBluetoothDevicePreferenceController} will use
|
||||||
|
* {@link DevicePreferenceCallback} to add/remove {@link Preference}.
|
||||||
|
*/
|
||||||
|
public class SavedHearingDevicePreferenceController extends
|
||||||
|
BaseBluetoothDevicePreferenceController implements LifecycleObserver, OnStart, OnResume,
|
||||||
|
OnStop {
|
||||||
|
|
||||||
|
private BluetoothDeviceUpdater mSavedHearingDeviceUpdater;
|
||||||
|
|
||||||
|
public SavedHearingDevicePreferenceController(Context context,
|
||||||
|
String preferenceKey) {
|
||||||
|
super(context, preferenceKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes objects in this controller. Need to call this before onStart().
|
||||||
|
*
|
||||||
|
* <p>Should not call this more than 1 time.
|
||||||
|
*
|
||||||
|
* @param fragment The {@link DashboardFragment} uses the controller.
|
||||||
|
*/
|
||||||
|
public void init(DashboardFragment fragment) {
|
||||||
|
if (mSavedHearingDeviceUpdater != null) {
|
||||||
|
throw new IllegalStateException("Should not call init() more than 1 time.");
|
||||||
|
}
|
||||||
|
mSavedHearingDeviceUpdater = new SavedHearingDeviceUpdater(fragment.getContext(), this,
|
||||||
|
fragment.getMetricsCategory());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStart() {
|
||||||
|
mSavedHearingDeviceUpdater.registerCallback();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
mSavedHearingDeviceUpdater.refreshPreference();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStop() {
|
||||||
|
mSavedHearingDeviceUpdater.unregisterCallback();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void displayPreference(PreferenceScreen screen) {
|
||||||
|
super.displayPreference(screen);
|
||||||
|
|
||||||
|
if (isAvailable()) {
|
||||||
|
final Context context = screen.getContext();
|
||||||
|
mSavedHearingDeviceUpdater.setPrefContext(context);
|
||||||
|
mSavedHearingDeviceUpdater.forceUpdate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,53 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 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 android.bluetooth.BluetoothDevice;
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;
|
||||||
|
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
||||||
|
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Maintains and updates saved (bonded but not connected) hearing devices, including ASHA and HAP
|
||||||
|
* profile.
|
||||||
|
*/
|
||||||
|
public class SavedHearingDeviceUpdater extends SavedBluetoothDeviceUpdater {
|
||||||
|
|
||||||
|
private static final String PREF_KEY = "saved_hearing_device";
|
||||||
|
|
||||||
|
public SavedHearingDeviceUpdater(Context context,
|
||||||
|
DevicePreferenceCallback devicePreferenceCallback, int metricsCategory) {
|
||||||
|
super(context, devicePreferenceCallback, /* showConnectedDevice= */ false, metricsCategory);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
|
||||||
|
final BluetoothDevice device = cachedDevice.getDevice();
|
||||||
|
final boolean isSavedHearingAidDevice = cachedDevice.isHearingAidDevice()
|
||||||
|
&& device.getBondState() == BluetoothDevice.BOND_BONDED
|
||||||
|
&& !device.isConnected();
|
||||||
|
|
||||||
|
return isSavedHearingAidDevice && isDeviceInCachedDevicesList(cachedDevice);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String getPreferenceKey() {
|
||||||
|
return PREF_KEY;
|
||||||
|
}
|
||||||
|
}
|
@@ -23,7 +23,6 @@ import android.util.Log;
|
|||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -39,9 +38,9 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater
|
|||||||
|
|
||||||
private final AudioManager mAudioManager;
|
private final AudioManager mAudioManager;
|
||||||
|
|
||||||
public AvailableMediaBluetoothDeviceUpdater(Context context, DashboardFragment fragment,
|
public AvailableMediaBluetoothDeviceUpdater(Context context,
|
||||||
DevicePreferenceCallback devicePreferenceCallback) {
|
DevicePreferenceCallback devicePreferenceCallback, int metricsCategory) {
|
||||||
super(context, fragment, devicePreferenceCallback);
|
super(context, devicePreferenceCallback, metricsCategory);
|
||||||
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
|
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,7 +101,7 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onPreferenceClick(Preference preference) {
|
public boolean onPreferenceClick(Preference preference) {
|
||||||
mMetricsFeatureProvider.logClickedPreference(preference, mFragment.getMetricsCategory());
|
mMetricsFeatureProvider.logClickedPreference(preference, mMetricsCategory);
|
||||||
final CachedBluetoothDevice device = ((BluetoothDevicePreference) preference)
|
final CachedBluetoothDevice device = ((BluetoothDevicePreference) preference)
|
||||||
.getBluetoothDevice();
|
.getBluetoothDevice();
|
||||||
return device.setActive();
|
return device.setActive();
|
||||||
|
@@ -27,11 +27,9 @@ import androidx.preference.Preference;
|
|||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
||||||
import com.android.settings.core.SubSettingLauncher;
|
import com.android.settings.core.SubSettingLauncher;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
|
||||||
import com.android.settings.overlay.FeatureFactory;
|
import com.android.settings.overlay.FeatureFactory;
|
||||||
import com.android.settings.widget.GearPreference;
|
import com.android.settings.widget.GearPreference;
|
||||||
import com.android.settingslib.bluetooth.BluetoothCallback;
|
import com.android.settingslib.bluetooth.BluetoothCallback;
|
||||||
import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
|
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||||
import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
||||||
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
|
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
|
||||||
@@ -46,39 +44,42 @@ import java.util.Map;
|
|||||||
* {@link BluetoothCallback}. It notifies the upper level whether to add/remove the preference
|
* {@link BluetoothCallback}. It notifies the upper level whether to add/remove the preference
|
||||||
* through {@link DevicePreferenceCallback}
|
* through {@link DevicePreferenceCallback}
|
||||||
*
|
*
|
||||||
* In {@link BluetoothDeviceUpdater}, it uses {@link BluetoothDeviceFilter.Filter} to detect
|
* In {@link BluetoothDeviceUpdater}, it uses {@link #isFilterMatched(CachedBluetoothDevice)} to
|
||||||
* whether the {@link CachedBluetoothDevice} is relevant.
|
* detect whether the {@link CachedBluetoothDevice} is relevant.
|
||||||
*/
|
*/
|
||||||
public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
|
public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
|
||||||
LocalBluetoothProfileManager.ServiceListener {
|
LocalBluetoothProfileManager.ServiceListener {
|
||||||
private static final String TAG = "BluetoothDeviceUpdater";
|
|
||||||
private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
|
|
||||||
|
|
||||||
protected final MetricsFeatureProvider mMetricsFeatureProvider;
|
protected final MetricsFeatureProvider mMetricsFeatureProvider;
|
||||||
protected final DevicePreferenceCallback mDevicePreferenceCallback;
|
protected final DevicePreferenceCallback mDevicePreferenceCallback;
|
||||||
protected final Map<BluetoothDevice, Preference> mPreferenceMap;
|
protected final Map<BluetoothDevice, Preference> mPreferenceMap;
|
||||||
|
protected Context mContext;
|
||||||
protected Context mPrefContext;
|
protected Context mPrefContext;
|
||||||
protected DashboardFragment mFragment;
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
protected LocalBluetoothManager mLocalManager;
|
protected LocalBluetoothManager mLocalManager;
|
||||||
|
protected int mMetricsCategory;
|
||||||
|
|
||||||
|
private static final String TAG = "BluetoothDeviceUpdater";
|
||||||
|
private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> {
|
final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> {
|
||||||
launchDeviceDetails(pref);
|
launchDeviceDetails(pref);
|
||||||
};
|
};
|
||||||
|
|
||||||
public BluetoothDeviceUpdater(Context context, DashboardFragment fragment,
|
public BluetoothDeviceUpdater(Context context,
|
||||||
DevicePreferenceCallback devicePreferenceCallback) {
|
DevicePreferenceCallback devicePreferenceCallback, int metricsCategory) {
|
||||||
this(context, fragment, devicePreferenceCallback, Utils.getLocalBtManager(context));
|
this(context, devicePreferenceCallback, Utils.getLocalBtManager(context), metricsCategory);
|
||||||
}
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
BluetoothDeviceUpdater(Context context, DashboardFragment fragment,
|
BluetoothDeviceUpdater(Context context,
|
||||||
DevicePreferenceCallback devicePreferenceCallback, LocalBluetoothManager localManager) {
|
DevicePreferenceCallback devicePreferenceCallback, LocalBluetoothManager localManager,
|
||||||
mFragment = fragment;
|
int metricsCategory) {
|
||||||
|
mContext = context;
|
||||||
mDevicePreferenceCallback = devicePreferenceCallback;
|
mDevicePreferenceCallback = devicePreferenceCallback;
|
||||||
mPreferenceMap = new HashMap<>();
|
mPreferenceMap = new HashMap<>();
|
||||||
mLocalManager = localManager;
|
mLocalManager = localManager;
|
||||||
|
mMetricsCategory = metricsCategory;
|
||||||
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
|
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,7 +91,7 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
|
|||||||
Log.e(TAG, "registerCallback() Bluetooth is not supported on this device");
|
Log.e(TAG, "registerCallback() Bluetooth is not supported on this device");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
mLocalManager.setForegroundActivity(mFragment.getContext());
|
mLocalManager.setForegroundActivity(mContext);
|
||||||
mLocalManager.getEventManager().registerCallback(this);
|
mLocalManager.getEventManager().registerCallback(this);
|
||||||
mLocalManager.getProfileManager().addServiceListener(this);
|
mLocalManager.getProfileManager().addServiceListener(this);
|
||||||
forceUpdate();
|
forceUpdate();
|
||||||
@@ -283,7 +284,7 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
|
|||||||
* {@link SubSettingLauncher} to launch {@link BluetoothDeviceDetailsFragment}
|
* {@link SubSettingLauncher} to launch {@link BluetoothDeviceDetailsFragment}
|
||||||
*/
|
*/
|
||||||
protected void launchDeviceDetails(Preference preference) {
|
protected void launchDeviceDetails(Preference preference) {
|
||||||
mMetricsFeatureProvider.logClickedPreference(preference, mFragment.getMetricsCategory());
|
mMetricsFeatureProvider.logClickedPreference(preference, mMetricsCategory);
|
||||||
final CachedBluetoothDevice device =
|
final CachedBluetoothDevice device =
|
||||||
((BluetoothDevicePreference) preference).getBluetoothDevice();
|
((BluetoothDevicePreference) preference).getBluetoothDevice();
|
||||||
if (device == null) {
|
if (device == null) {
|
||||||
@@ -293,11 +294,11 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
|
|||||||
args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS,
|
args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS,
|
||||||
device.getDevice().getAddress());
|
device.getDevice().getAddress());
|
||||||
|
|
||||||
new SubSettingLauncher(mFragment.getContext())
|
new SubSettingLauncher(mContext)
|
||||||
.setDestination(BluetoothDeviceDetailsFragment.class.getName())
|
.setDestination(BluetoothDeviceDetailsFragment.class.getName())
|
||||||
.setArguments(args)
|
.setArguments(args)
|
||||||
.setTitleRes(R.string.device_details_title)
|
.setTitleRes(R.string.device_details_title)
|
||||||
.setSourceMetricsCategory(mFragment.getMetricsCategory())
|
.setSourceMetricsCategory(mMetricsCategory)
|
||||||
.launch();
|
.launch();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -24,7 +24,6 @@ import android.util.Log;
|
|||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -39,9 +38,9 @@ public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
|
|||||||
|
|
||||||
private final AudioManager mAudioManager;
|
private final AudioManager mAudioManager;
|
||||||
|
|
||||||
public ConnectedBluetoothDeviceUpdater(Context context, DashboardFragment fragment,
|
public ConnectedBluetoothDeviceUpdater(Context context,
|
||||||
DevicePreferenceCallback devicePreferenceCallback) {
|
DevicePreferenceCallback devicePreferenceCallback, int metricsCategory) {
|
||||||
super(context, fragment, devicePreferenceCallback);
|
super(context, devicePreferenceCallback, metricsCategory);
|
||||||
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
|
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -25,8 +25,6 @@ import androidx.annotation.VisibleForTesting;
|
|||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
||||||
import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment;
|
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
|
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
|
||||||
|
|
||||||
@@ -44,15 +42,16 @@ public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater
|
|||||||
|
|
||||||
private static final String PREF_KEY = "saved_bt";
|
private static final String PREF_KEY = "saved_bt";
|
||||||
|
|
||||||
private final boolean mDisplayConnected;
|
private final boolean mShowConnectedDevice;
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
BluetoothAdapter mBluetoothAdapter;
|
BluetoothAdapter mBluetoothAdapter;
|
||||||
|
|
||||||
public SavedBluetoothDeviceUpdater(Context context, DashboardFragment fragment,
|
public SavedBluetoothDeviceUpdater(Context context,
|
||||||
DevicePreferenceCallback devicePreferenceCallback) {
|
DevicePreferenceCallback devicePreferenceCallback, boolean showConnectedDevice,
|
||||||
super(context, fragment, devicePreferenceCallback);
|
int metricsCategory) {
|
||||||
mDisplayConnected = (fragment instanceof PreviouslyConnectedDeviceDashboardFragment);
|
super(context, devicePreferenceCallback, metricsCategory);
|
||||||
|
mShowConnectedDevice = showConnectedDevice;
|
||||||
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
|
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -106,13 +105,13 @@ public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater
|
|||||||
+ cachedDevice.isConnected());
|
+ cachedDevice.isConnected());
|
||||||
}
|
}
|
||||||
return device.getBondState() == BluetoothDevice.BOND_BONDED
|
return device.getBondState() == BluetoothDevice.BOND_BONDED
|
||||||
&& (mDisplayConnected || (!device.isConnected() && isDeviceInCachedDevicesList(
|
&& (mShowConnectedDevice || (!device.isConnected() && isDeviceInCachedDevicesList(
|
||||||
cachedDevice)));
|
cachedDevice)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onPreferenceClick(Preference preference) {
|
public boolean onPreferenceClick(Preference preference) {
|
||||||
mMetricsFeatureProvider.logClickedPreference(preference, mFragment.getMetricsCategory());
|
mMetricsFeatureProvider.logClickedPreference(preference, mMetricsCategory);
|
||||||
final CachedBluetoothDevice device = ((BluetoothDevicePreference) preference)
|
final CachedBluetoothDevice device = ((BluetoothDevicePreference) preference)
|
||||||
.getBluetoothDevice();
|
.getBluetoothDevice();
|
||||||
if (device.isConnected()) {
|
if (device.isConnected()) {
|
||||||
|
@@ -131,7 +131,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
|
|||||||
public void init(DashboardFragment fragment) {
|
public void init(DashboardFragment fragment) {
|
||||||
mFragmentManager = fragment.getParentFragmentManager();
|
mFragmentManager = fragment.getParentFragmentManager();
|
||||||
mBluetoothDeviceUpdater = new AvailableMediaBluetoothDeviceUpdater(fragment.getContext(),
|
mBluetoothDeviceUpdater = new AvailableMediaBluetoothDeviceUpdater(fragment.getContext(),
|
||||||
fragment, AvailableMediaDeviceGroupController.this);
|
AvailableMediaDeviceGroupController.this, fragment.getMetricsCategory());
|
||||||
}
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
|
@@ -184,7 +184,8 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
|
|||||||
final DockUpdater connectedDockUpdater =
|
final DockUpdater connectedDockUpdater =
|
||||||
dockUpdaterFeatureProvider.getConnectedDockUpdater(context, this);
|
dockUpdaterFeatureProvider.getConnectedDockUpdater(context, this);
|
||||||
init(hasBluetoothFeature()
|
init(hasBluetoothFeature()
|
||||||
? new ConnectedBluetoothDeviceUpdater(context, fragment, this)
|
? new ConnectedBluetoothDeviceUpdater(context, this,
|
||||||
|
fragment.getMetricsCategory())
|
||||||
: null,
|
: null,
|
||||||
hasUsbFeature()
|
hasUsbFeature()
|
||||||
? new ConnectedUsbDeviceUpdater(context, fragment, this)
|
? new ConnectedUsbDeviceUpdater(context, fragment, this)
|
||||||
|
@@ -125,7 +125,8 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
|
|||||||
|
|
||||||
public void init(DashboardFragment fragment) {
|
public void init(DashboardFragment fragment) {
|
||||||
mBluetoothDeviceUpdater = new SavedBluetoothDeviceUpdater(fragment.getContext(),
|
mBluetoothDeviceUpdater = new SavedBluetoothDeviceUpdater(fragment.getContext(),
|
||||||
fragment, PreviouslyConnectedDevicePreferenceController.this);
|
PreviouslyConnectedDevicePreferenceController.this, /* showConnectedDevice= */
|
||||||
|
false, fragment.getMetricsCategory());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -117,7 +117,8 @@ public class SavedDeviceGroupController extends BasePreferenceController
|
|||||||
|
|
||||||
public void init(DashboardFragment fragment) {
|
public void init(DashboardFragment fragment) {
|
||||||
mBluetoothDeviceUpdater = new SavedBluetoothDeviceUpdater(fragment.getContext(),
|
mBluetoothDeviceUpdater = new SavedBluetoothDeviceUpdater(fragment.getContext(),
|
||||||
fragment, SavedDeviceGroupController.this);
|
SavedDeviceGroupController.this, /* showConnectedDevice= */true,
|
||||||
|
fragment.getMetricsCategory());
|
||||||
}
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
|
@@ -332,12 +332,13 @@ public class BluetoothDevicesSlice implements CustomSliceable {
|
|||||||
private void lazyInitUpdaters() {
|
private void lazyInitUpdaters() {
|
||||||
if (mAvailableMediaBtDeviceUpdater == null) {
|
if (mAvailableMediaBtDeviceUpdater == null) {
|
||||||
mAvailableMediaBtDeviceUpdater = new AvailableMediaBluetoothDeviceUpdater(mContext,
|
mAvailableMediaBtDeviceUpdater = new AvailableMediaBluetoothDeviceUpdater(mContext,
|
||||||
null /* fragment */, null /* devicePreferenceCallback */);
|
/* devicePreferenceCallback= */ null, /* metricsCategory= */ 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mSavedBtDeviceUpdater == null) {
|
if (mSavedBtDeviceUpdater == null) {
|
||||||
mSavedBtDeviceUpdater = new SavedBluetoothDeviceUpdater(mContext,
|
mSavedBtDeviceUpdater = new SavedBluetoothDeviceUpdater(mContext,
|
||||||
null /* fragment */, null /* devicePreferenceCallback */);
|
/* devicePreferenceCallback= */ null, /* showConnectedDevice= */
|
||||||
|
false, /* metricsCategory= */ 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -0,0 +1,135 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 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.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||||
|
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceCategory;
|
||||||
|
import androidx.preference.PreferenceManager;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
|
||||||
|
import com.android.settings.bluetooth.Utils;
|
||||||
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
|
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
|
||||||
|
import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Rule;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.Spy;
|
||||||
|
import org.mockito.junit.MockitoJUnit;
|
||||||
|
import org.mockito.junit.MockitoRule;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.annotation.Config;
|
||||||
|
|
||||||
|
/** Tests for {@link BaseBluetoothDevicePreferenceController}. */
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
@Config(shadows = {ShadowBluetoothUtils.class})
|
||||||
|
public class BaseBluetoothDevicePreferenceControllerTest {
|
||||||
|
@Rule
|
||||||
|
public MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||||
|
|
||||||
|
private static final String FAKE_KEY = "fake_key";
|
||||||
|
@Spy
|
||||||
|
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private LocalBluetoothManager mLocalBluetoothManager;
|
||||||
|
@Mock
|
||||||
|
private PackageManager mPackageManager;
|
||||||
|
private PreferenceCategory mPreferenceCategory;
|
||||||
|
private PreferenceManager mPreferenceManager;
|
||||||
|
private PreferenceScreen mScreen;
|
||||||
|
private TestBaseBluetoothDevicePreferenceController mController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
FakeFeatureFactory.setupForTest();
|
||||||
|
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
|
||||||
|
mPreferenceCategory = new PreferenceCategory(mContext);
|
||||||
|
mPreferenceCategory.setKey(FAKE_KEY);
|
||||||
|
mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
|
||||||
|
mPreferenceManager = new PreferenceManager(mContext);
|
||||||
|
mScreen = mPreferenceManager.createPreferenceScreen(mContext);
|
||||||
|
mScreen.addPreference(mPreferenceCategory);
|
||||||
|
doReturn(mPackageManager).when(mContext).getPackageManager();
|
||||||
|
mController = new TestBaseBluetoothDevicePreferenceController(mContext, FAKE_KEY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_hasBluetoothFeature_available() {
|
||||||
|
doReturn(true).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
|
||||||
|
|
||||||
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_noBluetoothFeature_conditionallyUnavailalbe() {
|
||||||
|
doReturn(false).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
|
||||||
|
|
||||||
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void displayPreference_preferenceCategoryInVisible() {
|
||||||
|
mController.displayPreference(mScreen);
|
||||||
|
|
||||||
|
assertThat(mPreferenceCategory.isVisible()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onDeviceAdded_preferenceCategoryVisible() {
|
||||||
|
Preference preference = new Preference(mContext);
|
||||||
|
mController.displayPreference(mScreen);
|
||||||
|
|
||||||
|
mController.onDeviceAdded(preference);
|
||||||
|
|
||||||
|
assertThat(mPreferenceCategory.isVisible()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onDeviceRemoved_addedPreferenceFirst_preferenceCategoryInVisible() {
|
||||||
|
Preference preference = new Preference(mContext);
|
||||||
|
mController.displayPreference(mScreen);
|
||||||
|
|
||||||
|
mController.onDeviceAdded(preference);
|
||||||
|
mController.onDeviceRemoved(preference);
|
||||||
|
|
||||||
|
assertThat(mPreferenceCategory.isVisible()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class TestBaseBluetoothDevicePreferenceController extends
|
||||||
|
BaseBluetoothDevicePreferenceController {
|
||||||
|
|
||||||
|
public TestBaseBluetoothDevicePreferenceController(Context context,
|
||||||
|
String preferenceKey) {
|
||||||
|
super(context, preferenceKey);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,138 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 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.doReturn;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.bluetooth.BluetoothDevice;
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
|
||||||
|
import com.android.settings.bluetooth.Utils;
|
||||||
|
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
||||||
|
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 org.junit.Before;
|
||||||
|
import org.junit.Rule;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.junit.MockitoJUnit;
|
||||||
|
import org.mockito.junit.MockitoRule;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.annotation.Config;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/** Tests for {@link SavedHearingDeviceUpdater}. */
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
@Config(shadows = {ShadowBluetoothUtils.class})
|
||||||
|
public class SavedHearingDeviceUpdaterTest {
|
||||||
|
@Rule
|
||||||
|
public MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||||
|
|
||||||
|
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private DevicePreferenceCallback mDevicePreferenceCallback;
|
||||||
|
@Mock
|
||||||
|
private CachedBluetoothDeviceManager mCachedDeviceManager;
|
||||||
|
@Mock
|
||||||
|
private LocalBluetoothManager mLocalBluetoothManager;
|
||||||
|
@Mock
|
||||||
|
private CachedBluetoothDevice mCachedBluetoothDevice;
|
||||||
|
@Mock
|
||||||
|
private BluetoothDevice mBluetoothDevice;
|
||||||
|
private SavedHearingDeviceUpdater mUpdater;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
|
||||||
|
mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
|
||||||
|
when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
|
||||||
|
when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
|
||||||
|
mUpdater = new SavedHearingDeviceUpdater(mContext,
|
||||||
|
mDevicePreferenceCallback, /* metricsCategory= */ 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isFilterMatch_savedHearingDevice_returnTrue() {
|
||||||
|
CachedBluetoothDevice savedHearingDevice = mCachedBluetoothDevice;
|
||||||
|
when(savedHearingDevice.isHearingAidDevice()).thenReturn(true);
|
||||||
|
doReturn(BluetoothDevice.BOND_BONDED).when(mBluetoothDevice).getBondState();
|
||||||
|
doReturn(false).when(mBluetoothDevice).isConnected();
|
||||||
|
when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(
|
||||||
|
new ArrayList<>(List.of(savedHearingDevice)));
|
||||||
|
|
||||||
|
assertThat(mUpdater.isFilterMatched(savedHearingDevice)).isEqualTo(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isFilterMatch_savedNonHearingDevice_returnFalse() {
|
||||||
|
CachedBluetoothDevice savedNonHearingDevice = mCachedBluetoothDevice;
|
||||||
|
when(savedNonHearingDevice.isHearingAidDevice()).thenReturn(false);
|
||||||
|
doReturn(BluetoothDevice.BOND_BONDED).when(mBluetoothDevice).getBondState();
|
||||||
|
doReturn(false).when(mBluetoothDevice).isConnected();
|
||||||
|
when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(
|
||||||
|
new ArrayList<>(List.of(savedNonHearingDevice)));
|
||||||
|
|
||||||
|
assertThat(mUpdater.isFilterMatched(savedNonHearingDevice)).isEqualTo(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isFilterMatch_savedBondingHearingDevice_returnFalse() {
|
||||||
|
CachedBluetoothDevice savedBondingHearingDevice = mCachedBluetoothDevice;
|
||||||
|
when(savedBondingHearingDevice.isHearingAidDevice()).thenReturn(true);
|
||||||
|
doReturn(BluetoothDevice.BOND_BONDING).when(mBluetoothDevice).getBondState();
|
||||||
|
doReturn(false).when(mBluetoothDevice).isConnected();
|
||||||
|
when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(
|
||||||
|
new ArrayList<>(List.of(savedBondingHearingDevice)));
|
||||||
|
|
||||||
|
assertThat(mUpdater.isFilterMatched(savedBondingHearingDevice)).isEqualTo(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isFilterMatch_connectedHearingDevice_returnFalse() {
|
||||||
|
CachedBluetoothDevice connectdHearingDevice = mCachedBluetoothDevice;
|
||||||
|
when(connectdHearingDevice.isHearingAidDevice()).thenReturn(true);
|
||||||
|
doReturn(BluetoothDevice.BOND_BONDED).when(mBluetoothDevice).getBondState();
|
||||||
|
doReturn(true).when(mBluetoothDevice).isConnected();
|
||||||
|
when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(
|
||||||
|
new ArrayList<>(List.of(connectdHearingDevice)));
|
||||||
|
|
||||||
|
assertThat(mUpdater.isFilterMatched(connectdHearingDevice)).isEqualTo(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isFilterMatch_hearingDeviceNotInCachedDevicesList_returnFalse() {
|
||||||
|
CachedBluetoothDevice notInCachedDevicesListDevice = mCachedBluetoothDevice;
|
||||||
|
when(notInCachedDevicesListDevice.isHearingAidDevice()).thenReturn(true);
|
||||||
|
doReturn(BluetoothDevice.BOND_BONDED).when(mBluetoothDevice).getBondState();
|
||||||
|
doReturn(false).when(mBluetoothDevice).isConnected();
|
||||||
|
when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(new ArrayList<>());
|
||||||
|
|
||||||
|
assertThat(mUpdater.isFilterMatched(notInCachedDevicesListDevice)).isEqualTo(false);
|
||||||
|
}
|
||||||
|
}
|
@@ -96,7 +96,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest {
|
|||||||
when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs);
|
when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs);
|
||||||
|
|
||||||
mBluetoothDeviceUpdater = spy(new AvailableMediaBluetoothDeviceUpdater(mContext,
|
mBluetoothDeviceUpdater = spy(new AvailableMediaBluetoothDeviceUpdater(mContext,
|
||||||
mDashboardFragment, mDevicePreferenceCallback));
|
mDevicePreferenceCallback, /* metricsCategory= */ 0));
|
||||||
mBluetoothDeviceUpdater.setPrefContext(mContext);
|
mBluetoothDeviceUpdater.setPrefContext(mContext);
|
||||||
mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false,
|
mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false,
|
||||||
BluetoothDevicePreference.SortType.TYPE_DEFAULT);
|
BluetoothDevicePreference.SortType.TYPE_DEFAULT);
|
||||||
|
@@ -34,7 +34,6 @@ import androidx.preference.Preference;
|
|||||||
|
|
||||||
import com.android.settings.SettingsActivity;
|
import com.android.settings.SettingsActivity;
|
||||||
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
|
||||||
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
|
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
|
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
|
||||||
@@ -62,8 +61,6 @@ public class BluetoothDeviceUpdaterTest {
|
|||||||
private static final String SUB_MAC_ADDRESS = "05:52:C7:0B:D8:3C";
|
private static final String SUB_MAC_ADDRESS = "05:52:C7:0B:D8:3C";
|
||||||
private static final String TEST_NAME = "test_name";
|
private static final String TEST_NAME = "test_name";
|
||||||
|
|
||||||
@Mock
|
|
||||||
private DashboardFragment mDashboardFragment;
|
|
||||||
@Mock
|
@Mock
|
||||||
private DevicePreferenceCallback mDevicePreferenceCallback;
|
private DevicePreferenceCallback mDevicePreferenceCallback;
|
||||||
@Mock
|
@Mock
|
||||||
@@ -84,7 +81,7 @@ public class BluetoothDeviceUpdaterTest {
|
|||||||
private Drawable mDrawable;
|
private Drawable mDrawable;
|
||||||
|
|
||||||
private Context mContext;
|
private Context mContext;
|
||||||
private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
|
private TestBluetoothDeviceUpdater mBluetoothDeviceUpdater;
|
||||||
private BluetoothDevicePreference mPreference;
|
private BluetoothDevicePreference mPreference;
|
||||||
private ShadowBluetoothAdapter mShadowBluetoothAdapter;
|
private ShadowBluetoothAdapter mShadowBluetoothAdapter;
|
||||||
private List<CachedBluetoothDevice> mCachedDevices = new ArrayList<>();
|
private List<CachedBluetoothDevice> mCachedDevices = new ArrayList<>();
|
||||||
@@ -97,7 +94,6 @@ public class BluetoothDeviceUpdaterTest {
|
|||||||
mContext = RuntimeEnvironment.application;
|
mContext = RuntimeEnvironment.application;
|
||||||
mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
|
mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
|
||||||
mCachedDevices.add(mCachedBluetoothDevice);
|
mCachedDevices.add(mCachedBluetoothDevice);
|
||||||
doReturn(mContext).when(mDashboardFragment).getContext();
|
|
||||||
when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
|
when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
|
||||||
when(mSubCachedBluetoothDevice.getDevice()).thenReturn(mSubBluetoothDevice);
|
when(mSubCachedBluetoothDevice.getDevice()).thenReturn(mSubBluetoothDevice);
|
||||||
when(mLocalManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
|
when(mLocalManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
|
||||||
@@ -107,20 +103,10 @@ public class BluetoothDeviceUpdaterTest {
|
|||||||
when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs);
|
when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs);
|
||||||
|
|
||||||
mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
|
mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
|
||||||
false, BluetoothDevicePreference.SortType.TYPE_DEFAULT);
|
/* showDeviceWithoutNames= */ false,
|
||||||
mBluetoothDeviceUpdater =
|
BluetoothDevicePreference.SortType.TYPE_DEFAULT);
|
||||||
new BluetoothDeviceUpdater(mContext, mDashboardFragment, mDevicePreferenceCallback,
|
mBluetoothDeviceUpdater = new TestBluetoothDeviceUpdater(mContext,
|
||||||
mLocalManager) {
|
mDevicePreferenceCallback, mLocalManager, /* metricsCategory= */ 0);
|
||||||
@Override
|
|
||||||
public boolean isFilterMatched(CachedBluetoothDevice cachedBluetoothDevice) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected String getPreferenceKey() {
|
|
||||||
return "test_bt";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
mBluetoothDeviceUpdater.setPrefContext(mContext);
|
mBluetoothDeviceUpdater.setPrefContext(mContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -185,7 +171,8 @@ public class BluetoothDeviceUpdaterTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testDeviceProfilesListener_click_startBluetoothDeviceDetailPage() {
|
public void testDeviceProfilesListener_click_startBluetoothDeviceDetailPage() {
|
||||||
doReturn(mSettingsActivity).when(mDashboardFragment).getContext();
|
mBluetoothDeviceUpdater = new TestBluetoothDeviceUpdater(mSettingsActivity,
|
||||||
|
mDevicePreferenceCallback, mLocalManager, /* metricsCategory= */ 0);
|
||||||
|
|
||||||
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
||||||
mBluetoothDeviceUpdater.mDeviceProfilesListener.onGearClick(mPreference);
|
mBluetoothDeviceUpdater.mDeviceProfilesListener.onGearClick(mPreference);
|
||||||
@@ -274,4 +261,22 @@ public class BluetoothDeviceUpdaterTest {
|
|||||||
|
|
||||||
assertThat(mPreference.getTitle()).isEqualTo(TEST_NAME);
|
assertThat(mPreference.getTitle()).isEqualTo(TEST_NAME);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static class TestBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
|
||||||
|
public TestBluetoothDeviceUpdater(Context context,
|
||||||
|
DevicePreferenceCallback devicePreferenceCallback,
|
||||||
|
LocalBluetoothManager localManager, int metricsCategory) {
|
||||||
|
super(context, devicePreferenceCallback, localManager, metricsCategory);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isFilterMatched(CachedBluetoothDevice cachedBluetoothDevice) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String getPreferenceKey() {
|
||||||
|
return "test_bt";
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -97,7 +97,7 @@ public class ConnectedBluetoothDeviceUpdaterTest {
|
|||||||
when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs);
|
when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs);
|
||||||
mShadowCachedBluetoothDeviceManager.setCachedDevicesCopy(mCachedDevices);
|
mShadowCachedBluetoothDeviceManager.setCachedDevicesCopy(mCachedDevices);
|
||||||
mBluetoothDeviceUpdater = spy(new ConnectedBluetoothDeviceUpdater(mContext,
|
mBluetoothDeviceUpdater = spy(new ConnectedBluetoothDeviceUpdater(mContext,
|
||||||
mDashboardFragment, mDevicePreferenceCallback));
|
mDevicePreferenceCallback, /* metricsCategory= */ 0));
|
||||||
mBluetoothDeviceUpdater.setPrefContext(mContext);
|
mBluetoothDeviceUpdater.setPrefContext(mContext);
|
||||||
doNothing().when(mBluetoothDeviceUpdater).addPreference(any());
|
doNothing().when(mBluetoothDeviceUpdater).addPreference(any());
|
||||||
doNothing().when(mBluetoothDeviceUpdater).removePreference(any());
|
doNothing().when(mBluetoothDeviceUpdater).removePreference(any());
|
||||||
|
@@ -91,8 +91,8 @@ public class SavedBluetoothDeviceUpdaterTest {
|
|||||||
when(mBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
|
when(mBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
|
||||||
when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs);
|
when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs);
|
||||||
|
|
||||||
mBluetoothDeviceUpdater = spy(new SavedBluetoothDeviceUpdater(mContext, mDashboardFragment,
|
mBluetoothDeviceUpdater = spy(new SavedBluetoothDeviceUpdater(mContext,
|
||||||
mDevicePreferenceCallback));
|
mDevicePreferenceCallback, false, /* metricsCategory= */ 0));
|
||||||
mBluetoothDeviceUpdater.setPrefContext(mContext);
|
mBluetoothDeviceUpdater.setPrefContext(mContext);
|
||||||
mBluetoothDeviceUpdater.mBluetoothAdapter = mBluetoothAdapter;
|
mBluetoothDeviceUpdater.mBluetoothAdapter = mBluetoothAdapter;
|
||||||
mBluetoothDeviceUpdater.mLocalManager = mBluetoothManager;
|
mBluetoothDeviceUpdater.mLocalManager = mBluetoothManager;
|
||||||
|
Reference in New Issue
Block a user