Merge "Add new pairing dialog for keyboard pairings." into honeycomb

3 files changed, 38 insertions, 22 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ee1a805..408ff2e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -763,8 +763,8 @@
     <string name="bluetooth_confirm_passkey_msg">To pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022, confirm that it is showing the passkey: <xliff:g id="passkey">%2$s</xliff:g>.</string>
     <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
     <string name="bluetooth_incoming_pairing_msg"><xliff:g id="device_name">%1$s</xliff:g>\nwants to pair.</string>
-    <!-- Message when bluetooth dialog when passkey needs to be displayed. -->
-    <string name="bluetooth_display_passkey_msg">Enter <xliff:g id="passkey">%2$s</xliff:g> on \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022 to pair. </string>
+    <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
+    <string name="bluetooth_display_passkey_pin_msg">Enter \u0022<xliff:g id="passkey">%2$s</xliff:g>\u0022 on \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022 to pair followed by return or enter. </string>
     <!-- Button text for accepting an incoming pairing request -->
     <string name="bluetooth_pairing_accept">Pair</string>
     <!-- Button text for declining an incoming pairing request -->
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index 4b7a0e0..1822e73 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -51,7 +51,7 @@ public class BluetoothPairingDialog extends AlertActivity implements DialogInter
     private LocalBluetoothManager mLocalManager;
     private BluetoothDevice mDevice;
     private int mType;
-    private String mPasskey;
+    private String mPairingKey;
     private EditText mPairingView;
     private Button mOkButton;
 
@@ -96,24 +96,29 @@ public class BluetoothPairingDialog extends AlertActivity implements DialogInter
             createUserEntryDialog();
         } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION){
             int passkey =
-                intent.getIntExtra(BluetoothDevice.EXTRA_PASSKEY, BluetoothDevice.ERROR);
+                intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY, BluetoothDevice.ERROR);
             if (passkey == BluetoothDevice.ERROR) {
                 Log.e(TAG, "Invalid ConfirmationPasskey received, not showing any dialog");
                 return;
             }
-            mPasskey = String.format("%06d", passkey);
+            mPairingKey = String.format("%06d", passkey);
             createConfirmationDialog();
         } else if (mType == BluetoothDevice.PAIRING_VARIANT_CONSENT) {
             createConsentDialog();
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
-            int passkey =
-                intent.getIntExtra(BluetoothDevice.EXTRA_PASSKEY, BluetoothDevice.ERROR);
-            if (passkey == BluetoothDevice.ERROR) {
-                Log.e(TAG, "Invalid ConfirmationPasskey received, not showing any dialog");
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY ||
+                   mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN) {
+            int pairingKey =
+                intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY, BluetoothDevice.ERROR);
+            if (pairingKey == BluetoothDevice.ERROR) {
+                Log.e(TAG, "Invalid Confirmation Passkey or PIN received, not showing any dialog");
                 return;
             }
-            mPasskey = String.format("%06d", passkey);
-            createDisplayPasskeyDialog();
+            if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
+                mPairingKey = String.format("%06d", pairingKey);
+            } else {
+                mPairingKey = String.format("%04d", pairingKey);
+            }
+            createDisplayPasskeyOrPinDialog();
         } else if (mType == BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT) {
             createConsentDialog();
         } else {
@@ -166,13 +171,15 @@ public class BluetoothPairingDialog extends AlertActivity implements DialogInter
         } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION) {
             mPairingView.setVisibility(View.GONE);
             messageView.setText(getString(R.string.bluetooth_confirm_passkey_msg, name,
-                    mPasskey));
+                    mPairingKey));
         } else if (mType == BluetoothDevice.PAIRING_VARIANT_CONSENT) {
             mPairingView.setVisibility(View.GONE);
             messageView.setText(getString(R.string.bluetooth_incoming_pairing_msg, name));
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY ||
+                    mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN) {
             mPairingView.setVisibility(View.GONE);
-            messageView.setText(getString(R.string.bluetooth_display_passkey_msg, name, mPasskey));
+            messageView.setText(getString(R.string.bluetooth_display_passkey_pin_msg, name,
+                    mPairingKey));
         } else if (mType == BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT) {
             mPairingView.setVisibility(View.GONE);
             messageView.setText(getString(R.string.bluetooth_incoming_pairing_msg, name));
@@ -206,18 +213,23 @@ public class BluetoothPairingDialog extends AlertActivity implements DialogInter
         setupAlert();
     }
 
-    private void createDisplayPasskeyDialog() {
+    private void createDisplayPasskeyOrPinDialog() {
         final AlertController.AlertParams p = mAlertParams;
         p.mIconId = android.R.drawable.ic_dialog_info;
         p.mTitle = getString(R.string.bluetooth_pairing_request);
         p.mView = createView();
-        p.mPositiveButtonText = getString(android.R.string.ok);
-        p.mPositiveButtonListener = this;
+        p.mNegativeButtonText = getString(android.R.string.cancel);
+        p.mNegativeButtonListener = this;
         setupAlert();
 
         // Since its only a notification, send an OK to the framework,
         // indicating that the dialog has been displayed.
-        mDevice.setPairingConfirmation(true);
+        if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
+            mDevice.setPairingConfirmation(true);
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN) {
+            byte[] pinBytes = BluetoothDevice.convertPinToBytes(mPairingKey);
+            mDevice.setPin(pinBytes);
+        }
     }
 
     @Override
@@ -252,6 +264,8 @@ public class BluetoothPairingDialog extends AlertActivity implements DialogInter
             mDevice.setPairingConfirmation(true);
         } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
             // Do Nothing.
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN) {
+            // Do Nothing
         } else if (mType == BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT) {
             mDevice.setRemoteOutOfBandData();
         } else {
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 0000205..6037c82 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -55,9 +55,11 @@ public class BluetoothPairingRequest extends BroadcastReceiver {
             pairingIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
             pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, type);
             if (type == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION ||
-                    type == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
-                int passkey = intent.getIntExtra(BluetoothDevice.EXTRA_PASSKEY, BluetoothDevice.ERROR);
-                pairingIntent.putExtra(BluetoothDevice.EXTRA_PASSKEY, passkey);
+                    type == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY ||
+                    type == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN) {
+                int pairingKey = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY,
+                        BluetoothDevice.ERROR);
+                pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_KEY, pairingKey);
             }
             pairingIntent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
             pairingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);