summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAndy Stadler <>2009-04-07 17:35:13 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-07 17:35:13 -0700
commitea6fea9bb22368c10083d5dce52adae86e51a243 (patch)
tree06ef52ef16080614dc888cec5d3b0af5be2474a6 /res
parent1b322065380409a3aecca90732207fa355957b84 (diff)
downloadandroid_packages_apps_Email-ea6fea9bb22368c10083d5dce52adae86e51a243.tar.gz
android_packages_apps_Email-ea6fea9bb22368c10083d5dce52adae86e51a243.tar.bz2
android_packages_apps_Email-ea6fea9bb22368c10083d5dce52adae86e51a243.zip
AI 144953: Provide UI for push mode accounts.
1. Generalize the code for the various spinners that control account check frequency. 2. Provide an API for looking up store attributes (and refactor existing instatiateStore logic to use it). 3. Cleanup the old code that was used to setup frequency spinners. 4. Hardwire Exchange accounts to default into push mode. Notes to tester: 1. For each account type (POP, IMAP, EAS) we need to check that auto & manual creation "do the right thing" for frequencies. POP & IMAP should offer "none" or time intervals, while EAS should offer "push", "none", or time intervals. 2. EAS accounts should default to "push", all others to "15 min" 3. Make sure that you can edit existing account settings and see the right choices (only EAS should be offered push). 4. I couldn't write an automated test for the mail checker service, please confirm that POP & IMAP accounts are checked at the right intervals (or never, if set for "none".) BUG=1776149 Automated import of CL 144953
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml22
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/xml/stores.xml3
3 files changed, 26 insertions, 1 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index cdf14b159..3fcc558bf 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -39,4 +39,26 @@
<item>60</item>
</string-array>
+
+ <!-- The arrays that are presented to push-enabled accounts -->
+ <string-array name="account_settings_check_frequency_entries_push">
+ <item>@string/account_setup_options_mail_check_frequency_push</item>
+ <item>@string/account_setup_options_mail_check_frequency_never</item>
+ <item>@string/account_setup_options_mail_check_frequency_5min</item>
+ <item>@string/account_setup_options_mail_check_frequency_10min</item>
+ <item>@string/account_setup_options_mail_check_frequency_15min</item>
+ <item>@string/account_setup_options_mail_check_frequency_30min</item>
+ <item>@string/account_setup_options_mail_check_frequency_1hour</item>
+ </string-array>
+
+ <string-array name="account_settings_check_frequency_values_push" translatable="false">
+ <item>-2</item>
+ <item>-1</item>
+ <item>5</item>
+ <item>10</item>
+ <item>15</item>
+ <item>30</item>
+ <item>60</item>
+ </string-array>
+
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 47dffdc6e..a7d8da2cf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -310,6 +310,8 @@
<string name="account_setup_options_mail_check_frequency_label">Email checking frequency</string>
<!-- In Account setup options & Account Settings screens, label for email check frequency option -->
<string name="account_setup_options_mail_check_frequency_never">Never</string>
+ <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+ <string name="account_setup_options_mail_check_frequency_push">Automatic (Push)</string>
<!-- In Account setup options & Account Settings screens, email check frequency option -->
<string name="account_setup_options_mail_check_frequency_5min">Every 5 minutes</string>
<!-- In Account setup options & Account Settings screens, email check frequency option -->
diff --git a/res/xml/stores.xml b/res/xml/stores.xml
index efe4ac227..f63b03495 100644
--- a/res/xml/stores.xml
+++ b/res/xml/stores.xml
@@ -35,5 +35,6 @@
<store scheme="imap" class="com.android.email.mail.store.ImapStore" />
<!-- This is here for temporary demo purposes only. Do not ship with this. -->
- <!-- store scheme="eas" class="com.android.email.mail.exchange.ExchangeStoreExample" / -->
+ <store scheme="eas" class="com.android.email.mail.exchange.ExchangeStoreExample"
+ push="true" />
</stores>