From a539716a94cbfe33e32229549b70d7cb418d8840 Mon Sep 17 00:00:00 2001
From: Edward Jee <edjee@google.com>
Date: Thu, 4 Sep 2014 22:18:21 -0700
Subject: Do not show phonebook access permission dialog if pairing dialog has
 already been shown.

Bug: 16964116, 13886947, 16345619

Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
---
 res/layout/bluetooth_pin_confirm.xml | 11 +++++++++++
 res/layout/bluetooth_pin_entry.xml   | 11 +++++++++++
 res/values/strings.xml               |  3 +++
 3 files changed, 25 insertions(+)

(limited to 'res')

diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index 2e2cd7f..241bedc 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -85,6 +85,17 @@
             android:textColor="@*android:color/secondary_text_material_light"
             android:visibility="gone" />
 
+        <TextView
+            android:id="@+id/phonebook_sharing_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/bluetooth_dialog_padding"
+            android:layout_marginEnd="@dimen/bluetooth_dialog_padding"
+            android:layout_marginBottom="@dimen/bluetooth_dialog_padding"
+            android:gravity="center_vertical"
+            android:text="@string/bluetooth_pairing_will_share_phonebook"
+            android:textSize="12sp" />
+
     </LinearLayout>
 
 </ScrollView>
diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml
index caca4fb..7161342 100644
--- a/res/layout/bluetooth_pin_entry.xml
+++ b/res/layout/bluetooth_pin_entry.xml
@@ -86,6 +86,17 @@
             android:gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
+        <TextView
+            android:id="@+id/phonebook_sharing_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/bluetooth_dialog_padding"
+            android:layout_marginEnd="@dimen/bluetooth_dialog_padding"
+            android:layout_marginBottom="@dimen/bluetooth_dialog_padding"
+            android:gravity="center_vertical"
+            android:text="@string/bluetooth_pairing_will_share_phonebook"
+            android:textSize="12sp" />
+
     </LinearLayout>
 
 </ScrollView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e054423..25bf278 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1165,6 +1165,9 @@
     <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
     <string name="bluetooth_pairing_decline">Cancel</string>
 
+    <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_pairing_will_share_phonebook">Pairing grants access to your contacts and call history when connected.</string>
+
     <!-- Title for BT error dialogs. -->
     <string name="bluetooth_error_title"></string>
     <!-- Message for the error dialog when BT pairing fails generically. -->
-- 
cgit v1.1