PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev

Browse Source
This commit is contained in:
Sanket Padawe
2015-06-16 15:24:04 +00:00
committed by Android (Google) Code Review
parent 6e61347242 2ef44c5e5d
commit 7171d6864f
4 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout/bluetooth_pin_confirm.xml
View File

@@ -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>

9
res/layout/bluetooth_pin_entry.xml
View File

@@ -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>