commit 79ad7235257bf6e6f04cc4f8f594176c938dc3a0
author PauloftheWest <paulofthewest@google.com> Mon Aug 25 16:12:08 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 25 16:12:08 2014 +0000
tree b4cde7b3b87b39d8389be12078929d61a1be1116
parent 6d98f8e1cbe23348c43a981d37d6b75fcfe99867
parent 1c649f7f9b9d85861c57d4d898b5fbe0e989d8b3

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

* commit '1c649f7f9b9d85861c57d4d898b5fbe0e989d8b3':
  Tapping a connected Bluetooth device now presents its settings dialog.

src/com/android/settings/bluetooth/BluetoothDevicePreference.java

diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index eca0cca..4b16ff4 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -56,6 +56,8 @@
 
     private AlertDialog mDisconnectDialog;
 
+    private View mView;
+
     public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice) {
         super(context);
 
@@ -140,6 +142,7 @@
             }
         }
 
+        mView = view;
         super.onBindView(view);
     }
 
@@ -179,7 +182,10 @@
         int bondState = mCachedDevice.getBondState();
 
         if (mCachedDevice.isConnected()) {
-            askDisconnect();
+            if (mOnSettingsClickListener != null) {
+                mView.setTag(mCachedDevice);
+                mOnSettingsClickListener.onClick(mView);
+            }
         } else if (bondState == BluetoothDevice.BOND_BONDED) {
             mCachedDevice.connect(true);
         } else if (bondState == BluetoothDevice.BOND_NONE) {