Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev am: 13438e6084
am: fd94f4b0be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291804 Change-Id: I024d5608df72e29c54092ebc69289baa6f3e8152 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -38,6 +38,7 @@ import com.android.settings.R;
|
||||
import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.core.SubSettingLauncher;
|
||||
import com.android.settingslib.bluetooth.BluetoothCallback;
|
||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
|
||||
import com.android.settingslib.bluetooth.HearingAidProfile;
|
||||
@@ -54,7 +55,7 @@ import java.util.concurrent.FutureTask;
|
||||
* Controller that shows and updates the bluetooth device name
|
||||
*/
|
||||
public class AccessibilityHearingAidPreferenceController extends BasePreferenceController
|
||||
implements LifecycleObserver, OnStart, OnStop {
|
||||
implements LifecycleObserver, OnStart, OnStop, BluetoothCallback {
|
||||
private static final String TAG = "AccessibilityHearingAidPreferenceController";
|
||||
private Preference mHearingAidPreference;
|
||||
|
||||
@@ -109,11 +110,13 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC
|
||||
filter.addAction(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
|
||||
filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
|
||||
mContext.registerReceiver(mHearingAidChangedReceiver, filter);
|
||||
mLocalBluetoothManager.getEventManager().registerCallback(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStop() {
|
||||
mContext.unregisterReceiver(mHearingAidChangedReceiver);
|
||||
mLocalBluetoothManager.getEventManager().unregisterCallback(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -159,6 +162,17 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC
|
||||
R.string.accessibility_hearingaid_right_side_device_summary, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
|
||||
if (activeDevice == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (bluetoothProfile == BluetoothProfile.HEARING_AID) {
|
||||
HearingAidUtils.launchHearingAidPairingDialog(mFragmentManager, activeDevice);
|
||||
}
|
||||
}
|
||||
|
||||
public void setFragmentManager(FragmentManager fragmentManager) {
|
||||
mFragmentManager = fragmentManager;
|
||||
}
|
||||
|
59
src/com/android/settings/accessibility/HearingAidUtils.java
Normal file
59
src/com/android/settings/accessibility/HearingAidUtils.java
Normal file
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* 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.accessibility;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
|
||||
import com.android.settings.bluetooth.HearingAidPairingDialogFragment;
|
||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||
import com.android.settingslib.bluetooth.HearingAidProfile;
|
||||
|
||||
/** Provides utility methods related hearing aids. */
|
||||
public final class HearingAidUtils {
|
||||
private static final String TAG = "HearingAidUtils";
|
||||
|
||||
private HearingAidUtils(){}
|
||||
|
||||
/**
|
||||
* Launches pairing dialog when hearing aid device needs other side of hearing aid device to
|
||||
* work.
|
||||
*
|
||||
* @param fragmentManager The {@link FragmentManager} used to show dialog fragment
|
||||
* @param device The {@link CachedBluetoothDevice} need to be hearing aid device
|
||||
*/
|
||||
public static void launchHearingAidPairingDialog(FragmentManager fragmentManager,
|
||||
@NonNull CachedBluetoothDevice device) {
|
||||
if (device.isConnectedHearingAidDevice()
|
||||
&& device.getDeviceMode() == HearingAidProfile.DeviceMode.MODE_BINAURAL
|
||||
&& device.getSubDevice() == null) {
|
||||
launchHearingAidPairingDialogInternal(fragmentManager, device);
|
||||
}
|
||||
}
|
||||
|
||||
private static void launchHearingAidPairingDialogInternal(FragmentManager fragmentManager,
|
||||
@NonNull CachedBluetoothDevice device) {
|
||||
if (device.getDeviceSide() == HearingAidProfile.DeviceSide.SIDE_INVALID) {
|
||||
Log.w(TAG, "Can not launch hearing aid pairing dialog for invalid side");
|
||||
return;
|
||||
}
|
||||
HearingAidPairingDialogFragment.newInstance(device).show(fragmentManager,
|
||||
HearingAidPairingDialogFragment.TAG);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user