diff options
| author | Edward Jee <edjee@google.com> | 2014-09-16 16:47:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-16 16:47:34 +0000 |
| commit | ea9c43ca6503d6bd57f7258341a41a664c7a7cee (patch) | |
| tree | d923dcc5b267d8891c4f7997d79d9808ecc98177 /res | |
| parent | f4713e0fad08dbcde9b61ad2bf8ec646d8022c14 (diff) | |
| parent | 299faadbfc73f62ed0e8be968d62a42daf203e87 (diff) | |
| download | packages_apps_Settings-ea9c43ca6503d6bd57f7258341a41a664c7a7cee.zip packages_apps_Settings-ea9c43ca6503d6bd57f7258341a41a664c7a7cee.tar.gz packages_apps_Settings-ea9c43ca6503d6bd57f7258341a41a664c7a7cee.tar.bz2 | |
am 299faadb: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
* commit '299faadbfc73f62ed0e8be968d62a42daf203e87':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/bluetooth_pin_confirm.xml | 11 | ||||
| -rw-r--r-- | res/layout/bluetooth_pin_entry.xml | 11 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
3 files changed, 25 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> 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 66e9c00..df9afb4 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. --> |