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

am 7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev

Browse Source 
* commit '7560e22d7602250172f6e6ca16fdea0063348d15':
  Tapping a connected Bluetooth device now presents its settings dialog.
This commit is contained in:
PauloftheWest
2014-08-25 15:58:29 +00:00
committed by Android Git Automerger
parent b1391d84fe 7560e22d76
commit 1c649f7f9b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,8 @@ public final class BluetoothDevicePreference extends Preference implements
private AlertDialog mDisconnectDialog; private AlertDialog mDisconnectDialog;
private View mView;
public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice) { public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice) {
super(context); super(context);
@@ -140,6 +142,7 @@ public final class BluetoothDevicePreference extends Preference implements
} }
} }
mView = view;
super.onBindView(view); super.onBindView(view);
} }
@@ -179,7 +182,10 @@ public final class BluetoothDevicePreference extends Preference implements
int bondState = mCachedDevice.getBondState(); int bondState = mCachedDevice.getBondState();
if (mCachedDevice.isConnected()) { if (mCachedDevice.isConnected()) {
askDisconnect(); if (mOnSettingsClickListener != null) {
mView.setTag(mCachedDevice);
mOnSettingsClickListener.onClick(mView);
}
} else if (bondState == BluetoothDevice.BOND_BONDED) { } else if (bondState == BluetoothDevice.BOND_BONDED) {
mCachedDevice.connect(true); mCachedDevice.connect(true);
} else if (bondState == BluetoothDevice.BOND_NONE) { } else if (bondState == BluetoothDevice.BOND_NONE) {