commit 9085541a1f65845d92e8e3be432c3c2e876ff81c
author Stanley Tng <stng@google.com> Thu Nov 29 13:47:45 2018 -0800
committer Stanley Tng <stng@google.com> Fri Nov 30 15:20:13 2018 -0800
tree 8b4ae58478900726619229e85d45cf21a1ec85b2
parent 801862313f1629d04074aff6c5ba56bf2d52bdc7

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: Iab52ff944d356f6c8cd7a0062fc67a0d55010fd1
Merged-In: I98cfda7905763a3da3dbc1fbed13fee881da7bb2

packages/SystemUI/res/values/strings.xml

diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 18f378e..d9da10f 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -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

diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
index cd00311..22c42d4 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
@@ -207,7 +207,10 @@
             } 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)) {