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

am 6ee5b450: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev

Browse Source 
* commit '6ee5b4508083fd0dd340396d66927c0fc8870a9b':
  Bluetooth MAP profile - sms and mms support initial check-in
This commit is contained in:
Zhihai Xu
2013-08-09 18:49:59 -07:00
committed by Android Git Automerger
parent 3c7fdfd9e9 6ee5b45080
commit eb9cecd98b
5 changed files with 164 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/bluetooth_pb_access.xml → res/layout/bluetooth_access.xml
View File

@@ -36,12 +36,12 @@
android:gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox android:id="@+id/bluetooth_pb_remember_choice"
<CheckBox android:id="@+id/bluetooth_remember_choice"
style="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:text="@string/bluetooth_pb_remember_choice" />
android:text="@string/bluetooth_remember_choice" />
</LinearLayout>

11
res/values/strings.xml
View File

@@ -355,8 +355,19 @@
<string name="bluetooth_pb_acceptance_dialog_text">%1$s wants to access your contacts and call history. Give access to %2$s?</string>
<!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
<string name="bluetooth_remember_choice">Don\'t ask again</string>
<!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
<string name="bluetooth_pb_remember_choice">Don\'t ask again</string>
<!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
<string name="bluetooth_map_request">"Message request"</string>
<!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
<string name="bluetooth_map_acceptance_dialog_text">%1$s wants to access your messages. Give access to %2$s?</string>
<!-- Date & time settings screen title -->
<string name="date_and_time">Date &amp; time settings</string>
<!-- The title of the activity to pick a time zone. -->