diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/bluetooth_mas_access.xml | 49 | ||||
| -rw-r--r-- | res/values/arrays.xml | 50 | ||||
| -rw-r--r-- | res/values/strings.xml | 49 |
3 files changed, 103 insertions, 45 deletions
diff --git a/res/layout/bluetooth_mas_access.xml b/res/layout/bluetooth_mas_access.xml new file mode 100644 index 0000000..dc7c2d5 --- /dev/null +++ b/res/layout/bluetooth_mas_access.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2009, The Android Open Source Project +** Copyright (c) 2011, Code Aurora Forum. All rights reserved. +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<ScrollView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <LinearLayout + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="vertical"> + + <TextView + android:id="@+id/message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="20dip" + android:layout_marginRight="20dip" + android:gravity="center_horizontal" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <CheckBox android:id="@+id/bluetooth_mas_remember_choice" + style="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="2dip" + android:text="@string/bluetooth_mas_remember_choice" /> + + </LinearLayout> + +</ScrollView> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 3862ae2..c6f8cc4 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,22 +1,22 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2007 The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2007 The Android Open Source Project + Copyright (C) 2013 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Choices for timezone picker first level. These values will be used as search terms for TimeZone displayName strings. --> <skip /> @@ -800,7 +800,7 @@ <item>Always allow</item> </string-array> - <!-- **** CYANOGENMOD EDITS START **** --> + <!-- **** CYANOGENMOD ADDITIONS START **** --> <!-- Volume Overlay options. --> <string-array name="volume_overlay_entries"> @@ -1052,9 +1052,9 @@ </string-array> <string-array name="entries_network_widget"> - <item>2G/3G+2G</item> - <item>2G/3G Only</item> - <item>2G/3G Only/3G+2G</item> + <item>2G | 2G+3G</item> + <item>2G | 3G</item> + <item>2G | 3G | 2G+3G</item> </string-array> <string-array name="values_network_widget" translatable="false"> @@ -1084,8 +1084,8 @@ </integer-array> <string-array name="entries_screentimeout_widget"> - <item>15s/1m/5m</item> - <item>30s/2m/5m</item> + <item>15s | 1m | 5m</item> + <item>30s | 2m | 5m</item> </string-array> <string-array name="values_screentimeout_widget" translatable="false"> @@ -1254,5 +1254,5 @@ <item>200</item> </string-array> - <!-- **** CYANOGENMOD EDITS END **** --> + <!-- **** CYANOGENMOD ADDITIONS END **** --> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0793ad4..62bc4cb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,22 +1,22 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2007 The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2007 The Android Open Source Project + Copyright (C) 2013 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Strings for Dialog yes button --> <string name="yes">"Yes"</string> @@ -357,6 +357,15 @@ <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] --> <string name="bluetooth_pb_remember_choice">Don\'t ask again</string> + <!-- Activity label of BluetoothMasPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] --> + <string name="bluetooth_mas_request">"Message Access request"</string> + + <!-- Bluetooth MAS permission Alert Activity text [CHAR LIMIT=none] --> + <string name="bluetooth_mas_acceptance_dialog_text">%1$s would like to access your messages. Give access to %2$s?</string> + + <!-- Bluetooth MAS permission Alert Activity checkbox text [CHAR LIMIT=none] --> + <string name="bluetooth_mas_remember_choice">Don\'t ask again</string> + <!-- Date & time settings screen title --> <string name="date_and_time">Date & time settings</string> <!-- The title of the activity to pick a time zone. --> @@ -4424,7 +4433,7 @@ <!-- Cell Broadcast settings description [CHAR LIMIT=100] --> <string name="cell_broadcast_settings_summary">Select the types of emergency alerts to display.</string> - <!-- CYANOGENMOD EDITS START --> + <!-- **** CYANOGENMOD ADDITIONS START **** --> <string name="ok">OK</string> @@ -4943,7 +4952,7 @@ <string name="cm_sound_mode_silent">Silent</string> <string name="cm_sound_mode_vibrate">Vibrate</string> <string name="cm_sound_mode_sound">Sound</string> - <string name="cm_sound_mode_soundVibrate">Sound + Vibrate</string> + <string name="cm_sound_mode_soundVibrate">Sound & Vibrate</string> <string name="pref_flash_mode_title">Flash mode</string> <string name="expanded_haptic_feedback_title">Haptic feedback</string> |