diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-06-12 18:09:45 -0700 |
|---|---|---|
| committer | Sanket Padawe <sanketpadawe@google.com> | 2015-06-12 18:09:45 -0700 |
| commit | 2ef44c5e5def598d07f599675982e1a8b3aefc73 (patch) | |
| tree | 1e1123f96849c523c9d3917a32b16ef5c9700479 /res/layout | |
| parent | e27e3bcf9efcc605e56de7c0257c6a02527601a0 (diff) | |
| download | packages_apps_Settings-2ef44c5e5def598d07f599675982e1a8b3aefc73.tar.gz packages_apps_Settings-2ef44c5e5def598d07f599675982e1a8b3aefc73.tar.bz2 packages_apps_Settings-2ef44c5e5def598d07f599675982e1a8b3aefc73.zip | |
Add PBAP checkbox for BT pairing consent dialog.
Bug: 20488109
Change-Id: Ib6c98c27e6d2b8e59fa4b640df15214a6b197853
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/bluetooth_pin_confirm.xml | 9 | ||||
| -rw-r--r-- | res/layout/bluetooth_pin_entry.xml | 9 |
2 files changed, 8 insertions, 10 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> |