Merge "Make headset icons consistent before / after pairing"

This commit is contained in:
Marie Janssen
2017-01-25 16:02:13 +00:00
committed by Gerrit Code Review

View File

@@ -286,12 +286,12 @@ public final class BluetoothDevicePreference extends Preference implements
} }
} }
if (btClass != null) { 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); 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); return new Pair<Integer, String>(R.drawable.ic_settings_bluetooth, BLUETOOTH);
} }