PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: a78e718b26

Change-Id: I20b0fe30ab6b882e4f517147e9ffabe786d73988
This commit is contained in:
Marie Janssen
2017-01-25 16:16:12 +00:00
committed by android-build-merger
parent b3d76c0c22 a78e718b26
commit 42c61c10cc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/bluetooth/BluetoothDevicePreference.java
View File

@@ -284,12 +284,12 @@ public final class BluetoothDevicePreference extends Preference implements
} }
} }
if (btClass != null) { if (btClass != null) {
if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) { if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
return new Pair<Integer, String>(R.drawable.ic_bt_headphones_a2dp, HEADPHONE);
}
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);
} }