Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23417c3a authored by jasonwshsu's avatar jasonwshsu
Browse files

[Pair hearing devices] Add "Hearing devices" to show connected hearing devices 

Bug: 237625815
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableHearingDeviceUpdaterTest
Change-Id: I15bff230cac29fdbad13d452878bc57b57d9773e
parent c1fb0ae2

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -4541,6 +4541,8 @@ 
    <!-- Title for the hearing device pairing preference. [CHAR LIMIT=20] -->

    <string name="accessibility_hearing_device_pairing_title">Pair new device</string>

    <!-- Title for the preference category containing the connected hearing device group. [CHAR LIMIT=20]-->

    <string name="accessibility_hearing_device_connected_title">Hearing devices</string>

    <!-- Title for the preference category containing the previously connected hearing device group. [CHAR LIMIT=20]-->

    <string name="accessibility_hearing_device_saved_title">Saved devices</string>

    <!-- Title for the preference category containing the controls of the hearing device. [CHAR LIMIT=35] -->

    <string name="accessibility_hearing_device_control">Hearing device controls</string>

res/xml/accessibility_hearing_aids.xml

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ 
    android:key="accessibility_hearing_devices_screen"

    android:title="@string/accessibility_hearingaid_title">



    <PreferenceCategory

        android:key="available_hearing_devices"

        android:title="@string/accessibility_hearing_device_connected_title"

        settings:controller="com.android.settings.accessibility.AvailableHearingDevicePreferenceController"/>



    <com.android.settingslib.RestrictedPreference

        android:key="add_bt_devices"

        android:title="@string/bluetooth_pairing_pref_title"

src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java

+2 −17
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.content.IntentFilter; 
import android.os.Bundle;

import android.text.TextUtils;

import android.util.FeatureFlagUtils;

import android.util.Log;



import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.FragmentManager;
@@ -55,8 +54,6 @@ import com.android.settingslib.core.lifecycle.events.OnStop; 
import java.util.ArrayList;

import java.util.List;

import java.util.Set;

import java.util.concurrent.ExecutionException;

import java.util.concurrent.FutureTask;

import java.util.stream.Collectors;



/**
@@ -84,7 +81,8 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC 


    public AccessibilityHearingAidPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

        mLocalBluetoothManager = getLocalBluetoothManager();

        mLocalBluetoothManager = com.android.settings.bluetooth.Utils.getLocalBluetoothManager(

                context);

        mProfileManager = mLocalBluetoothManager.getProfileManager();

        mCachedDeviceManager = mLocalBluetoothManager.getCachedDeviceManager();

        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -269,19 +267,6 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC 
        return false;

    }



    private LocalBluetoothManager getLocalBluetoothManager() {

        final FutureTask<LocalBluetoothManager> localBtManagerFutureTask = new FutureTask<>(

                // Avoid StrictMode ThreadPolicy violation

                () -> com.android.settings.bluetooth.Utils.getLocalBtManager(mContext));

        try {

            localBtManagerFutureTask.run();

            return localBtManagerFutureTask.get();

        } catch (InterruptedException | ExecutionException e) {

            Log.w(TAG, "Error getting LocalBluetoothManager.", e);

            return null;

        }

    }



    @VisibleForTesting(otherwise = VisibleForTesting.NONE)

    void setPreference(Preference preference) {

        mHearingAidPreference = preference;

src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ public class AccessibilityHearingAidsFragment extends AccessibilityShortcutPrefe 
    @Override

    public void onAttach(Context context) {

        super.onAttach(context);

        use(AvailableHearingDevicePreferenceController.class).init(this);

        use(SavedHearingDevicePreferenceController.class).init(this);

    }

src/com/android/settings/accessibility/AvailableHearingDevicePreferenceController.java

0 → 100644
+109 −0
Original line number Diff line number Diff line 
/*

 * 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.BluetoothProfile;

import android.content.Context;



import androidx.fragment.app.FragmentManager;

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.bluetooth.BluetoothCallback;

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.OnStart;

import com.android.settingslib.core.lifecycle.events.OnStop;



/**

 * Controller to update the {@link androidx.preference.PreferenceCategory} for all

 * connected hearing devices, including ASHA and HAP profile.

 * Parent class {@link BaseBluetoothDevicePreferenceController} will use

 * {@link DevicePreferenceCallback} to add/remove {@link Preference}.

 */

public class AvailableHearingDevicePreferenceController extends

        BaseBluetoothDevicePreferenceController implements LifecycleObserver, OnStart, OnStop,

        BluetoothCallback {



    private static final String TAG = "AvailableHearingDevicePreferenceController";



    private BluetoothDeviceUpdater mAvailableHearingDeviceUpdater;

    private final LocalBluetoothManager mLocalBluetoothManager;

    private FragmentManager mFragmentManager;



    public AvailableHearingDevicePreferenceController(Context context,

            String preferenceKey) {

        super(context, preferenceKey);

        mLocalBluetoothManager = com.android.settings.bluetooth.Utils.getLocalBluetoothManager(

                context);

    }



    /**

     * 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 (mAvailableHearingDeviceUpdater != null) {

            throw new IllegalStateException("Should not call init() more than 1 time.");

        }

        mAvailableHearingDeviceUpdater = new AvailableHearingDeviceUpdater(fragment.getContext(),

                this, fragment.getMetricsCategory());

        mFragmentManager = fragment.getParentFragmentManager();

    }



    @Override

    public void onStart() {

        mAvailableHearingDeviceUpdater.registerCallback();

        mAvailableHearingDeviceUpdater.refreshPreference();

        mLocalBluetoothManager.getEventManager().registerCallback(this);

    }



    @Override

    public void onStop() {

        mAvailableHearingDeviceUpdater.unregisterCallback();

        mLocalBluetoothManager.getEventManager().unregisterCallback(this);

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);



        if (isAvailable()) {

            final Context context = screen.getContext();

            mAvailableHearingDeviceUpdater.setPrefContext(context);

            mAvailableHearingDeviceUpdater.forceUpdate();

        }

    }



    @Override

    public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {

        if (activeDevice == null) {

            return;

        }



        if (bluetoothProfile == BluetoothProfile.HEARING_AID) {

            HearingAidUtils.launchHearingAidPairingDialog(mFragmentManager, activeDevice);

        }

    }

}