Merge "BluetoothDialog view fixed for no pair code case"
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index ebdf65d..1e5eb0b 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 f1c50d0..ba15a19 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 b176efd..fe48148 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -309,6 +309,8 @@
break;
case BluetoothDevice.PAIRING_VARIANT_CONSENT:
+ messagePairing.setVisibility(view.GONE);
+ break;
case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT:
messagePairing.setVisibility(View.VISIBLE);
break;