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

Browse Source 
am: 60eb5503e8

Change-Id: Ida107059b3a5ec815f198659ff8174c8ff375efe
This commit is contained in:
Marie Janssen
2017-01-25 16:10:29 +00:00
committed by android-build-merger
parent 698862f60d 60eb5503e8
commit a78e718b26
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/bluetooth/BluetoothDevicePreference.java
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);
} }