Add per-account preference for bkgnd attachments

* Add flag to Account record
* Add checkbox to Account Settings (IMAP & EAS)
* Add checkbox to Account Setup (IMAP & EAS)
* Add flag to backup/restore logic
* Update Account & AccountSetupOptions unit tests

Bug: 3360873
Change-Id: I0c407776ede4110f33716644f6f027938f21130a

1 files changed, 14 insertions, 9 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1e6f7b05..d30c5613 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -34,6 +34,10 @@
     <string name="permission_access_provider_label"></string>
     <!-- Do Not Translate.  Unused string. -->
     <string name="permission_access_provider_desc"></string>
+    <!-- Do Not Translate.  Unused string. -->
+    <string name="general_preference_background_attachments_label"></string>
+    <!-- Do Not Translate.  Unused string. -->
+    <string name="general_preference_background_attachments_summary"></string>
 
     <!-- Name of application on Home screen -->
     <string name="app_name">Email</string>
@@ -632,6 +636,10 @@ save attachment.</string>
     <!-- In Account setup options screen, check box to sync email -->
     <string name="account_setup_options_sync_email_label">Sync email from this account.
     </string>
+    <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none]
+        -->
+    <string name="account_setup_options_background_attachments_label">Auto-download attachments
+        when connected via 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 -->
@@ -749,6 +757,12 @@ save attachment.</string>
     <!-- Note, this should usually match the default account account setup checkbox string -->
     <string name="account_settings_default_summary">Send email from this account by default</string>
     <!-- On Settings screen, setting option name -->
+    <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
+    <string name="account_settings_background_attachments_label">
+        Auto-download attachments</string>
+    <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
+    <string name="account_settings_background_attachments_summary">
+        Download files attached to recent messages when connected via Wi-Fi</string>
     <string name="account_settings_notify_label">Email notifications</string>
     <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
         [CHAR LIMIT=50] -->
@@ -974,15 +988,6 @@ save attachment.</string>
     <!-- General preference:  Text zoom.  Value is "huge" (+2) [CHAR LIMIT=32] -->
     <string name="general_preference_text_zoom_huge">Huge</string>
 
-    <!-- General preference:  Allow downloading of attachments in background -->
-    <!-- Title of general preference for downloading attachments in background [CHAR LIMIT=32] -->
-    <string name="general_preference_background_attachments_label">
-        Automatically fetch attachments</string>
-    <!-- Summary of general preference for downloading attachments in background [CHAR LIMIT=64] -->
-    <string name="general_preference_background_attachments_summary">
-        Download attachments for Inbox messages.  (Not available for POP3 accounts.)
-    </string>
-
     <!-- Generic string for "current position" / "total number" [CHAR LIMIT=12] -->
     <string name="position_of_count"><xliff:g example="1">%1$d</xliff:g> of <xliff:g
             example="12">%2$s</xliff:g></string>