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

am 32c56ed4: am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev

Browse Source 
* commit '32c56ed434dbeec9cf2b0db62f43396d5b2a08d5':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
This commit is contained in:
Edward Jee
2014-09-16 09:07:06 +00:00
committed by Android Git Automerger
parent 88f7fa0b9e 32c56ed434
commit 170be5c8c8
6 changed files with 69 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout/bluetooth_pin_confirm.xml
View File

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

11
res/layout/bluetooth_pin_entry.xml
View File

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

3
res/values/strings.xml
View File

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