Update sync settings UI to specs

- minor text changes
- use light holo theme
- slight order changes

Bug: 5110452
Change-Id: Icf558ee495860dc97048765d3b8d09d31161dd32

5 files changed, 43 insertions, 44 deletions

diff --git a/res/menu-sw600dp/email_activity_options.xml b/res/menu-sw600dp/email_activity_options.xml
index 5d0627f4e..0f509b349 100644
--- a/res/menu-sw600dp/email_activity_options.xml
+++ b/res/menu-sw600dp/email_activity_options.xml
@@ -52,15 +52,15 @@
         android:visible="false"
     />
     <item
-        android:id="@+id/account_settings"
+        android:id="@+id/mailbox_settings"
         android:orderInCategory="2000"
-        android:title="@string/account_settings_action"
+        android:title="@string/mailbox_settings_action"
         android:icon="@android:drawable/ic_menu_preferences"
     />
     <item
-        android:id="@+id/mailbox_settings"
+        android:id="@+id/account_settings"
         android:orderInCategory="3000"
-        android:title="@string/mailbox_settings_action"
+        android:title="@string/settings_action"
         android:icon="@android:drawable/ic_menu_preferences"
     />
 </menu>
diff --git a/res/menu/email_activity_options.xml b/res/menu/email_activity_options.xml
index fb463636f..e0a51f01c 100644
--- a/res/menu/email_activity_options.xml
+++ b/res/menu/email_activity_options.xml
@@ -65,15 +65,15 @@
         android:visible="false"
     />
     <item
-        android:id="@+id/account_settings"
+        android:id="@+id/mailbox_settings"
         android:orderInCategory="2000"
-        android:title="@string/settings_action"
+        android:title="@string/mailbox_settings_action"
         android:icon="@android:drawable/ic_menu_preferences"
     />
     <item
-        android:id="@+id/mailbox_settings"
+        android:id="@+id/account_settings"
         android:orderInCategory="3000"
-        android:title="@string/mailbox_settings_action"
+        android:title="@string/settings_action"
         android:icon="@android:drawable/ic_menu_preferences"
     />
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2ec7e97cf..eaf6816b9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -136,7 +136,7 @@
     <!-- Menu item for settings [CHAR LIMIT=40]-->
     <string name="settings_action">Settings</string>
     <!-- Menu item [CHAR LIMIT=32] -->
-    <string name="mailbox_settings_action">Folder settings</string>
+    <string name="mailbox_settings_action">Sync options</string>
     <!-- Menu item -->
     <string name="mark_as_unread_action">Mark as unread</string>
     <!-- Menu item for moving messages to folders [CHAR LIMIT=10] -->
@@ -777,7 +777,7 @@ save attachment.</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 lookback selector -->
-    <string name="account_setup_options_mail_window_label">Amount to synchronize</string>
+    <string name="account_setup_options_mail_window_label">Days to sync</string>
     <!-- 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>
@@ -1035,15 +1035,15 @@ save attachment.</string>
     <string name="account_settings_delete_account_label">Remove account</string>
 
     <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
-    <string name="mailbox_settings_activity_title">Folder settings</string>
+    <string name="mailbox_settings_activity_title">Sync options</string>
     <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
-    <string name="mailbox_settings_activity_title_with_mailbox">Folder settings (<xliff:g id="mailboxx_name" example="Family">%s</xliff:g>)</string>
+    <string name="mailbox_settings_activity_title_with_mailbox">Sync options (<xliff:g id="mailboxx_name" example="Family">%s</xliff:g>)</string>
     <!-- Mailbox "sync settings" preference header [CHAR LIMIT=none] -->
     <string name="mailbox_preferences_header">Sync settings</string>
     <!-- On mailbox settings screen: Mailbox check frequency setting label [CHAR LIMIT=none] -->
     <string name="mailbox_settings_mailbox_check_frequency_label">Check frequency</string>
     <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
-    <string name="mailbox_settings_mailbox_sync_window_label">Amount to synchronize</string>
+    <string name="mailbox_settings_mailbox_sync_window_label">Days to sync</string>
 
     <!-- Strings used for account shortcut picker -->
     <!-- String displayed in launcher [CHAR_LIMIT=10] -->
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 6a3db204c..7b6fa9bd6 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -61,29 +61,32 @@
 
         <!-- Reserve order#2 here for window size (if inserted) -->
 
-        <!-- (will hide on POP3 accounts) -->
-        <CheckBoxPreference
-            android:key="account_background_attachments"
-            android:order="3"
-            android:title="@string/account_settings_background_attachments_label"
-            android:summary="@string/account_settings_background_attachments_summary" />
-
-
         <CheckBoxPreference
             android:key="account_sync_email"
+            android:order="3"
             android:defaultValue="true"
             android:title="@string/account_settings_sync_email_enable"
             android:summary="@string/account_settings_sync_email_summary" />
         <CheckBoxPreference
             android:key="account_sync_contacts"
+            android:order="4"
             android:defaultValue="true"
             android:title="@string/account_settings_sync_contacts_enable"
             android:summary="@string/account_settings_sync_contacts_summary" />
         <CheckBoxPreference
             android:key="account_sync_calendar"
+            android:order="5"
             android:defaultValue="true"
             android:title="@string/account_settings_sync_calendar_enable"
             android:summary="@string/account_settings_sync_calendar_summary" />
+
+        <!-- (will hide on POP3 accounts) -->
+        <CheckBoxPreference
+            android:key="account_background_attachments"
+            android:order="6"
+            android:title="@string/account_settings_background_attachments_label"
+            android:summary="@string/account_settings_background_attachments_summary" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/mailbox_preferences.xml b/res/xml/mailbox_preferences.xml
index 370ee559a..361986a98 100644
--- a/res/xml/mailbox_preferences.xml
+++ b/res/xml/mailbox_preferences.xml
@@ -16,28 +16,24 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory
-            android:title="@string/mailbox_preferences_header">
+    <!-- summary is set at runtime -->
+    <ListPreference
+        android:key="check_frequency"
+        android:title="@string/mailbox_settings_mailbox_check_frequency_label"
+        android:dialogTitle="@string/mailbox_settings_mailbox_check_frequency_label"
+        android:entries="@array/account_settings_check_frequency_entries_push"
+        android:entryValues="@array/account_settings_check_frequency_values_push"
+        android:persistent="false"
+        />
+
+    <!-- summary is set at runtime -->
+    <ListPreference
+        android:key="sync_window"
+        android:title="@string/mailbox_settings_mailbox_sync_window_label"
+        android:dialogTitle="@string/mailbox_settings_mailbox_sync_window_label"
+        android:entries="@array/account_settings_mail_window_entries_with_default"
+        android:entryValues="@array/account_settings_mail_window_values_with_default"
+        android:persistent="false"
+        />
 
-        <!-- summary is set at runtime -->
-        <ListPreference
-            android:key="check_frequency"
-            android:title="@string/mailbox_settings_mailbox_check_frequency_label"
-            android:dialogTitle="@string/mailbox_settings_mailbox_check_frequency_label"
-            android:entries="@array/account_settings_check_frequency_entries_push"
-            android:entryValues="@array/account_settings_check_frequency_values_push"
-            android:persistent="false"
-            />
-
-        <!-- summary is set at runtime -->
-        <ListPreference
-            android:key="sync_window"
-            android:title="@string/mailbox_settings_mailbox_sync_window_label"
-            android:dialogTitle="@string/mailbox_settings_mailbox_sync_window_label"
-            android:entries="@array/account_settings_mail_window_entries_with_default"
-            android:entryValues="@array/account_settings_mail_window_values_with_default"
-            android:persistent="false"
-            />
-
-    </PreferenceCategory>
 </PreferenceScreen>