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

am 776dcff1: Merge change 26878 into eclair

Browse Source 
Merge commit '776dcff14387140721d46ccd97cf51ce81be7f85' into eclair-plus-aosp

* commit '776dcff14387140721d46ccd97cf51ce81be7f85':
  b/2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)
This commit is contained in:
Michael Chan
2009-09-25 10:19:24 -07:00
committed by Android Git Automerger
parent 7a6341b076 776dcff143
commit 520c7356cf
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/bluetooth/CachedBluetoothDevice.java
View File

@@ -610,13 +610,22 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
return R.drawable.ic_bt_cellphone;
}
if (mProfiles.contains(Profile.A2DP)) {
return R.drawable.ic_bt_headphones_a2dp;
} else if (mProfiles.contains(Profile.HEADSET)) {
return R.drawable.ic_bt_headset_hfp;
if (mProfiles.size() > 0) {
if (mProfiles.contains(Profile.A2DP)) {
return R.drawable.ic_bt_headphones_a2dp;
} else if (mProfiles.contains(Profile.HEADSET)) {
return R.drawable.ic_bt_headset_hfp;
}
} else {
return 0;
if (mBtClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
return R.drawable.ic_bt_headphones_a2dp;
}
if (mBtClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
return R.drawable.ic_bt_headset_hfp;
}
}
return 0;
}
/**