diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/bluetooth_pin_confirm.xml | 9 | ||||
| -rw-r--r-- | res/layout/bluetooth_pin_entry.xml | 9 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
3 files changed, 8 insertions, 12 deletions
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml index 08f5d9fc5..2968b3882 100644 --- a/res/layout/bluetooth_pin_confirm.xml +++ b/res/layout/bluetooth_pin_confirm.xml @@ -86,16 +86,15 @@ android:textColor="@*android:color/secondary_text_material_light" android:visibility="gone" /> - <TextView - android:id="@+id/phonebook_sharing_message" + <CheckBox + android:id="@+id/phonebook_sharing_message_confirm_pin" 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" /> + android:text="@string/bluetooth_pairing_shares_phonebook" + android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml index 6f50cd422..aa9f18774 100644 --- a/res/layout/bluetooth_pin_entry.xml +++ b/res/layout/bluetooth_pin_entry.xml @@ -87,16 +87,15 @@ android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textColor="@*android:color/secondary_text_material_light"/> - <TextView - android:id="@+id/phonebook_sharing_message" + <CheckBox + android:id="@+id/phonebook_sharing_message_entry_pin" 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" /> + android:text="@string/bluetooth_pairing_shares_phonebook" + android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 789224c02..3d74e5d51 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1155,8 +1155,6 @@ <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. --> <string name="bluetooth_display_passkey_pin_msg">To pair with:<xliff:g id="bold1"><br><b></xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold1"></b><br><br></xliff:g>Type on it:<xliff:g id="bold2"><br><b></xliff:g><xliff:g id="passkey">%2$s</xliff:g><xliff:g id="end_bold2"></b></xliff:g>, then press Return or Enter.</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> <!-- Checkbox message in pairing dialogs. [CHAR LIMIT=NONE] --> <string name="bluetooth_pairing_shares_phonebook">Grant access to your contacts and call history when connected.</string> |