commit 60eb5503e8aa94fc23e5193cb1d17b4086b5abcc
author Marie Janssen <jamuraa@google.com> Wed Jan 25 16:08:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 16:08:01 2017 +0000
tree a8d45e378a58293f2d65e898b4b016ca923af5ee
parent 185275e0ad54b97e95273fd6895c2efb2d3e18a1
parent a2e068a2b4dde2df9d48e3e9508b6d0e43765401

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

Change-Id: I036781f8908da81ea294abafaf6c72e9d03699c8

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 a45e7b4..69e66ae 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -286,12 +286,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);
     }