From 4d279a56f5b63d16081b4d9aa889e7ec6e744d59 Mon Sep 17 00:00:00 2001
From: Salvador Martinez <dehboxturtle@google.com>
Date: Fri, 30 Sep 2016 13:59:30 -0700
Subject: [PATCH] BluetoothDialog view fixed for no pair code case

BluetoothPairingDialog no longer asks for a
pair code when the user only needs to
confirm that they would like to connect
to a device. Also, the layout padding
was updated a bit to make it look nicer.

Test: RunSettingsRoboTests
Bug: 31340598
Change-Id: I9394fcd53dffcff9a17fbafabdce0e94ae88fba2
---
 res/layout/bluetooth_pin_confirm.xml                           | 1 +
 res/values/dimens.xml                                          | 1 +
 src/com/android/settings/bluetooth/BluetoothPairingDialog.java | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index ebdf65de78f..1e5eb0b8731 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -27,6 +27,7 @@
         android:paddingStart="16dip"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
+        android:layout_marginTop="@dimen/bluetooth_dialog_padding_top"
         android:orientation="vertical">
 
         <TextView
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 816bb099ff3..4a2301752ac 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -204,6 +204,7 @@
 
     <!-- Bluetooth Preferences -->
     <dimen name="bluetooth_dialog_padding">8dip</dimen>
+    <dimen name="bluetooth_dialog_padding_top">20dp</dimen>
     <integer name="bluetooth_name_length">32</integer>
     <dimen name="bluetooth_pairing_padding">24dp</dimen>
     <dimen name="bluetooth_pairing_edittext_padding">21dp</dimen>
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index b176efde3ba..fe4814801b0 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -309,6 +309,8 @@ public final class BluetoothPairingDialog extends AlertActivity implements
                 break;
 
             case BluetoothDevice.PAIRING_VARIANT_CONSENT:
+                messagePairing.setVisibility(view.GONE);
+                break;
             case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT:
                 messagePairing.setVisibility(View.VISIBLE);
                 break;