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

Commit 4627ad60 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Display Hearing Aids name on UI tile"

parents e7753e08 9085541a

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -693,6 +693,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
@@ -207,7 +207,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)) {