diff options
| author | Edward Jee <edjee@google.com> | 2014-09-04 22:18:21 -0700 |
|---|---|---|
| committer | Joe Bass <jbass@google.com> | 2014-09-15 14:33:13 -0700 |
| commit | a539716a94cbfe33e32229549b70d7cb418d8840 (patch) | |
| tree | e908fffddb59e0059f234de4af139952a0e71bf3 /res/layout/bluetooth_pin_confirm.xml | |
| parent | 13fbd848d4d39e81bb79231f1d6f63722a7b36f6 (diff) | |
| download | packages_apps_Settings-a539716a94cbfe33e32229549b70d7cb418d8840.zip packages_apps_Settings-a539716a94cbfe33e32229549b70d7cb418d8840.tar.gz packages_apps_Settings-a539716a94cbfe33e32229549b70d7cb418d8840.tar.bz2 | |
Do not show phonebook access permission dialog if pairing dialog has already been shown.
Bug: 16964116, 13886947, 16345619
Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
Diffstat (limited to 'res/layout/bluetooth_pin_confirm.xml')
| -rw-r--r-- | res/layout/bluetooth_pin_confirm.xml | 11 |
1 files changed, 11 insertions, 0 deletions
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> |