summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSam Blitzstein <sblitz@google.com>2013-02-26 09:47:52 -0800
committerSam Blitzstein <sblitz@google.com>2013-02-26 12:51:14 -0800
commit1bc7c4b149a3696dca055a3d7a45499851e55d50 (patch)
tree917e327135b8a13193fc7a551ebc2305d1082a11 /res
parent666123ec1274420a77ace01e32df70baf87fca57 (diff)
downloadandroid_packages_apps_Calendar-1bc7c4b149a3696dca055a3d7a45499851e55d50.tar.gz
android_packages_apps_Calendar-1bc7c4b149a3696dca055a3d7a45499851e55d50.tar.bz2
android_packages_apps_Calendar-1bc7c4b149a3696dca055a3d7a45499851e55d50.zip
Refactored strings for experimental reminder setting.
String was too long for setting of skipping reminders for events that have not been responded to. Reformatted the setting from checkbox into radio selection with more consice description. Change-Id: Ic6a689648529212d3ae16359e5386ba0c0f4e587
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml13
-rw-r--r--res/values/strings.xml8
-rw-r--r--res/xml/other_preferences.xml6
3 files changed, 21 insertions, 6 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 3ae95abb..e2c577e4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -404,4 +404,17 @@
<item>Month</item>
<item>Agenda</item>
</string-array>
+
+ <!-- Experimental options for skipping reminders. [CHAR LIMIT = 35] -->
+ <string-array name="preferences_skip_reminders_labels">
+ <!-- Default choice -->
+ <item>Only if declined</item>
+ <!-- Second option, for skipping reminders to events not yet responded to. -->
+ <item>If declined or not responded</item>
+ </string-array>
+
+ <string-array name="preferences_skip_reminders_values" translatable="false">
+ <item>declined</item>
+ <item>not_responded</item>
+ </string-array>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4d687f0d..d88647d5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -567,10 +567,10 @@
<!-- Reminders settings [CHAR LIMIT = 30]-->
<string name="preferences_reminders_category">Reminders</string>
- <!-- Preference label for when to send reminders [CHAR LIMIT = 25] -->
- <string name="preferences_reminders_responded_label">Limit reminders by attendance</string>
- <!-- Preference description for when to send reminders [CHAR LIMIT = NONE]-->
- <string name="preferences_reminders_responded_description">Don\'t post reminders unless you\'ve responded \"Yes\" or \"Maybe\"</string>
+ <!-- Preference label for when to skip reminders [CHAR LIMIT = 25] -->
+ <string name="preferences_reminders_responded_label">Skip Reminders</string>
+ <!-- Dialog title for when to skip reminders [CHAR LIMIT = 25] -->
+ <string name="preferences_reminders_responded_dialog">Skip Reminders</string>
<!-- Preference label for quiet hours [CHAR LIMIT = 25]-->
<string name="preferences_reminders_quiet_hours_label">Quiet hours</string>
<!-- Preference description for quiet hours [CHAR LIMIT = NONE]-->
diff --git a/res/xml/other_preferences.xml b/res/xml/other_preferences.xml
index a368b19e..411643e9 100644
--- a/res/xml/other_preferences.xml
+++ b/res/xml/other_preferences.xml
@@ -25,10 +25,12 @@
<PreferenceCategory
android:key="preferences_reminders_category"
android:title="@string/preferences_reminders_category" >
- <CheckBoxPreference
+ <ListPreference
android:key="preferences_reminders_responded"
android:title="@string/preferences_reminders_responded_label"
- android:summary="@string/preferences_reminders_responded_description"/>
+ android:entries="@array/preferences_skip_reminders_labels"
+ android:entryValues="@array/preferences_skip_reminders_values"
+ android:dialogTitle="@string/preferences_reminders_responded_dialog" />
<CheckBoxPreference
android:key="preferences_reminders_quiet_hours"
android:title="@string/preferences_reminders_quiet_hours_label"