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

Commit c118294a authored by Stanley Tng's avatar Stanley Tng
Browse files

Display Hearing Aids name on UI tile 

When the current device is a hearing aids, display the name under the
tile.

Bug: 117423826
Test: Manual testing on phone with hearing aids connected
Change-Id: I98cfda7905763a3da3dbc1fbed13fee881da7bb2
parent b13f29ed

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+4 −0
Original line number Diff line number Diff line
@@ -203,6 +203,10 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        mHiSyncId = id;

    }



    public boolean isHearingAidDevice() {

        return mHiSyncId != BluetoothHearingAid.HI_SYNC_ID_INVALID;

    }



    void onBondingDockConnect() {

        // Attempt to connect if UUIDs are available. Otherwise,

        // we will connect when the ACTION_UUID intent arrives.

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -700,6 +700,8 @@ 
    <string name="quick_settings_bluetooth_secondary_label_headset">Headset</string>

    <!-- QuickSettings: Bluetooth secondary label for an input/IO device being connected [CHAR LIMIT=20]-->

    <string name="quick_settings_bluetooth_secondary_label_input">Input</string>

    <!-- QuickSettings: Bluetooth secondary label for a Hearing Aids device being connected [CHAR LIMIT=20]-->

    <string name="quick_settings_bluetooth_secondary_label_hearing_aids">Hearing Aids</string>

    <!-- QuickSettings: Bluetooth secondary label shown when bluetooth is being enabled [CHAR LIMIT=NONE] -->

    <string name="quick_settings_bluetooth_secondary_label_transient">Turning on&#8230;</string>

    <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java

+4 −1
Original line number Diff line number Diff line
@@ -205,7 +205,10 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { 
            } else {

                final BluetoothClass bluetoothClass = lastDevice.getBtClass();

                if (bluetoothClass != null) {

                    if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {

                    if (lastDevice.isHearingAidDevice()) {

                        return mContext.getString(

                                R.string.quick_settings_bluetooth_secondary_label_hearing_aids);

                    } else if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {

                        return mContext.getString(

                                R.string.quick_settings_bluetooth_secondary_label_audio);

                    } else if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {