summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMarc Blank <mblank@google.com>2011-05-04 12:31:31 -0700
committerMarc Blank <mblank@google.com>2011-05-05 08:16:44 -0700
commit335a724ee68a0a36acec75299503b2eaf4ac97d5 (patch)
tree702ee7c259540078048b83658ff3dda113163b30 /res
parentc6beaaea590564860b7a61c30c4091dbc66959d1 (diff)
downloadandroid_packages_apps_Email-335a724ee68a0a36acec75299503b2eaf4ac97d5.tar.gz
android_packages_apps_Email-335a724ee68a0a36acec75299503b2eaf4ac97d5.tar.bz2
android_packages_apps_Email-335a724ee68a0a36acec75299503b2eaf4ac97d5.zip
Implement "automatic" sync lookback (Email side)
* Update sync window options to include "Automatic" and "All" * Make the default (for new accounts) "Automatic" Change-Id: Icbc696f55abcfad79e66079ebb414ca50778dcaa
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml6
-rw-r--r--res/values/strings.xml17
2 files changed, 15 insertions, 8 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c4f052e64..7c11753ca 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -62,23 +62,25 @@
</string-array>
<!-- Mail sync window sizes for EAS accounts -->
- <!-- Note, "all" (value 6) is not presented in UI. -->
<string-array name="account_settings_mail_window_entries">
+ <item>@string/account_setup_options_mail_window_auto</item>
<item>@string/account_setup_options_mail_window_1day</item>
<item>@string/account_setup_options_mail_window_3days</item>
<item>@string/account_setup_options_mail_window_1week</item>
<item>@string/account_setup_options_mail_window_2weeks</item>
<item>@string/account_setup_options_mail_window_1month</item>
+ <item>@string/account_setup_options_mail_window_all</item>
</string-array>
<!-- Mail sync window size codes for EAS accounts -->
- <!-- Note, "all" (value 6) is not presented in UI. -->
<string-array name="account_settings_mail_window_values" translatable="false">
+ <item>-2</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
+ <item>6</item>
</string-array>
<!-- The vibrate notification modes -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 57fbff327..c34bef9a6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -730,18 +730,23 @@ save attachment.</string>
Automatically download attachments when connected to Wi-Fi</string>
<!-- Dialog title when "setup" could not finish -->
<string name="account_setup_failed_dlg_title">Setup could not finish</string>
- <!-- In Account setup options screen, label for email check frequency selector -->
+ <!-- In Account setup options screen, label for email lookback selector -->
<string name="account_setup_options_mail_window_label">Amount to synchronize</string>
- <!-- In account setup options & account settings screens (exchange), sync window length -->
+ <!-- In account setup options & account settings screens (exchange), sync window length; this
+ implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
+ <string name="account_setup_options_mail_window_auto">Automatic</string>
+ <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25] -->
<string name="account_setup_options_mail_window_1day">One day</string>
- <!-- In account setup options & account settings screens (exchange), sync window length -->
+ <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25] -->
<string name="account_setup_options_mail_window_3days">Three days</string>
- <!-- In account setup options & account settings screens (exchange), sync window length -->
+ <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25] -->
<string name="account_setup_options_mail_window_1week">One week</string>
- <!-- In account setup options & account settings screens (exchange), sync window length -->
+ <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25] -->
<string name="account_setup_options_mail_window_2weeks">Two weeks</string>
- <!-- In account setup options & account settings screens (exchange), sync window length -->
+ <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25] -->
<string name="account_setup_options_mail_window_1month">One month</string>
+ <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25] -->
+ <string name="account_setup_options_mail_window_all">All</string>
<!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
<string name="account_setup_failed_dlg_auth_message">Username or password incorrect.</string>