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

Update application for Bluetooth API changes.

Browse Source 
Change-Id: I8351611f0f0c5eda3e423dbe7e7b53e52d75ac36
This commit is contained in:
Nick Pelly
2009-09-09 17:46:25 -07:00
parent cded847838
commit 16cc86315d
12 changed files with 84 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
private final BluetoothDevice mDevice;
private String mName;
private short mRssi;
private int mBtClass = BluetoothClass.ERROR;
private BluetoothClass mBtClass;
private List<Profile> mProfiles = new ArrayList<Profile>();
@@ -301,7 +301,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
askDisconnect();
} else if (bondState == BluetoothDevice.BOND_BONDED) {
connect();
} else if (bondState == BluetoothDevice.BOND_NOT_BONDED) {
} else if (bondState == BluetoothDevice.BOND_NONE) {
pair();
}
}
@@ -424,7 +424,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
}
private boolean ensurePaired() {
if (getBondState() == BluetoothDevice.BOND_NOT_BONDED) {
if (getBondState() == BluetoothDevice.BOND_NONE) {
pair();
return false;
} else {
@@ -577,7 +577,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
}
public int getBtClassDrawable() {
switch (BluetoothClass.Device.Major.getDeviceMajor(mBtClass)) {
switch (mBtClass.getMajorDeviceClass()) {
case BluetoothClass.Device.Major.COMPUTER:
return R.drawable.ic_bt_laptop;
@@ -599,7 +599,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
*/
private void fetchBtClass() {
mBtClass = mDevice.getBluetoothClass();
if (mBtClass != BluetoothClass.ERROR) {
if (mBtClass != null) {
LocalBluetoothProfileManager.fill(mBtClass, mProfiles);
}
}
@@ -613,8 +613,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
dispatchAttributesChanged();
}
public void setBtClass(int btClass) {
if (mBtClass != btClass && btClass != BluetoothClass.ERROR) {
public void setBtClass(BluetoothClass btClass) {
if (btClass != null && mBtClass != btClass) {
mBtClass = btClass;
LocalBluetoothProfileManager.fill(mBtClass, mProfiles);
dispatchAttributesChanged();
@@ -699,7 +699,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
menu.setHeaderTitle(getName());
if (bondState == BluetoothDevice.BOND_NOT_BONDED) { // Not paired and not connected
if (bondState == BluetoothDevice.BOND_NONE) { // Not paired and not connected
menu.add(0, CONTEXT_ITEM_CONNECT, 0, R.string.bluetooth_device_context_pair_connect);
} else { // Paired
if (isConnected) { // Paired and connected