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

Merge "Revert "Tapping a connected Bluetooth device now presents its settings dialog."" into lmp-dev

Browse Source
This commit is contained in:
Paul West
2014-08-27 20:33:30 +00:00
committed by Android (Google) Code Review
parent ffb76318f9 c0963dd7c5
commit ad280a9b09
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,8 +56,6 @@ 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);
@@ -142,7 +140,6 @@ public final class BluetoothDevicePreference extends Preference implements
} }
} }
mView = view;
super.onBindView(view); super.onBindView(view);
} }
@@ -182,10 +179,7 @@ public final class BluetoothDevicePreference extends Preference implements
int bondState = mCachedDevice.getBondState(); int bondState = mCachedDevice.getBondState();
if (mCachedDevice.isConnected()) { if (mCachedDevice.isConnected()) {
if (mOnSettingsClickListener != null) { askDisconnect();
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) {