commit 42c61c10cc61d6bd52cd96290f6aaeb869a8321f
author Marie Janssen <jamuraa@google.com> Wed Jan 25 16:16:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 16:16:12 2017 +0000
tree c32104639cdc6cf4fd18e753fba20683c2e19920
parent b3d76c0c22d0ccfd7e3f3fd1b847442a51dd9e2d
parent a78e718b26c2915bf74fa7587a0d0a1ca7e858cd

Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9 am: a2e068a2b4 am: 60eb5503e8
am: a78e718b26

Change-Id: I20b0fe30ab6b882e4f517147e9ffabe786d73988

src/com/android/settings/bluetooth/BluetoothDevicePreference.java

diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index b956aa5..3fc0abf 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -284,12 +284,12 @@
             }
         }
         if (btClass != null) {
-            if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
-                return new Pair<Integer, String>(R.drawable.ic_bt_headphones_a2dp, HEADPHONE);
-            }
-            if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
+          if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
                 return new Pair<Integer, String>(R.drawable.ic_bt_headset_hfp, HEADSET);
             }
+          if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
+                return new Pair<Integer, String>(R.drawable.ic_bt_headphones_a2dp, HEADPHONE);
+            }
         }
         return new Pair<Integer, String>(R.drawable.ic_settings_bluetooth, BLUETOOTH);
     }