From c0963dd7c5a35fdb007a2954644c1352060350d1 Mon Sep 17 00:00:00 2001 From: Paul West Date: Wed, 27 Aug 2014 20:31:38 +0000 Subject: [PATCH] Revert "Tapping a connected Bluetooth device now presents its settings dialog." This reverts commit 893be9cc34c37cba64856c8034f39dfbda05a459. Change-Id: Idefe6a1972ca1130a687632f74051e5b5a2e54e1 --- .../settings/bluetooth/BluetoothDevicePreference.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java index 4b16ff49071..eca0ccafb46 100644 --- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java @@ -56,8 +56,6 @@ public final class BluetoothDevicePreference extends Preference implements private AlertDialog mDisconnectDialog; - private View mView; - public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice) { super(context); @@ -142,7 +140,6 @@ public final class BluetoothDevicePreference extends Preference implements } } - mView = view; super.onBindView(view); } @@ -182,10 +179,7 @@ public final class BluetoothDevicePreference extends Preference implements int bondState = mCachedDevice.getBondState(); if (mCachedDevice.isConnected()) { - if (mOnSettingsClickListener != null) { - mView.setTag(mCachedDevice); - mOnSettingsClickListener.onClick(mView); - } + askDisconnect(); } else if (bondState == BluetoothDevice.BOND_BONDED) { mCachedDevice.connect(true); } else if (bondState == BluetoothDevice.BOND_NONE) {