Move GeneralPrefsFragment to UnifiedEmail

b/9566150

Change-Id: I016708a04aebcaa3b95960a9dc9f74bf4efea823

6 files changed, 207 insertions, 1 deletions

diff --git a/res/menu-sw600dp/general_prefs_fragment_menu.xml b/res/menu-sw600dp/general_prefs_fragment_menu.xml
new file mode 100644
index 000000000..5957b1cbc
--- /dev/null
+++ b/res/menu-sw600dp/general_prefs_fragment_menu.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 Google Inc.
+     Licensed to The Android Open Source Project.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/clear_search_history_menu_item"
+        android:showAsAction="never"
+        android:visible="false"
+        android:title="@string/clear_history_title"/>
+    <item
+        android:id="@+id/clear_picture_approvals_menu_item"
+        android:showAsAction="never"
+        android:title="@string/clear_display_images_whitelist_title"/>
+    <item
+        android:id="@+id/manage_accounts_menu_item"
+        android:title="@string/manage_accounts_menu_item"
+        android:visible="false"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/feedback_menu_item"
+        android:icon="@android:drawable/ic_menu_send"
+        android:title="@string/feedback"/>
+
+    <!-- TODO add help menu item, once help support has been moved to UnifiedEmail -->
+</menu>
diff --git a/res/menu/general_prefs_fragment_menu.xml b/res/menu/general_prefs_fragment_menu.xml
index 8e92d5c69..c1f2f17df 100644
--- a/res/menu/general_prefs_fragment_menu.xml
+++ b/res/menu/general_prefs_fragment_menu.xml
@@ -19,6 +19,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
+        android:id="@+id/clear_search_history_menu_item"
+        android:showAsAction="never"
+        android:visible="false"
+        android:title="@string/clear_history_title"/>
+    <item
         android:id="@+id/clear_picture_approvals_menu_item"
         android:showAsAction="never"
         android:title="@string/clear_display_images_whitelist_title"/>
@@ -28,4 +33,4 @@
         android:title="@string/feedback"/>
 
     <!-- TODO add help menu item, once help support has been moved to UnifiedEmail -->
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index a011f2f1d..cf11a37e5 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -34,4 +34,7 @@
         <attr name="barHeight" format="dimension" />
         <attr name="detentWidth" format="dimension" />
     </declare-styleable>
+    <declare-styleable name="FancySummaryListPreference">
+        <attr name="entrySummaries" format="reference" />
+    </declare-styleable>
 </resources>
diff --git a/res/values/defaults.xml b/res/values/defaults.xml
index b2c6215c0..2b37ca275 100644
--- a/res/values/defaults.xml
+++ b/res/values/defaults.xml
@@ -19,4 +19,5 @@
     <!-- Default visibility mode of conversation view snap header, matches values in UIProvider -->
     <!-- Display in portrait only -->
     <integer name="prefDefault_snapHeader">1</integer>
+    <bool name="prefDefault_actionStripActionReplyAll">false</bool>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9e6487478..31c4a3bac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -734,6 +734,9 @@
         <item>Show conversation list after you delete</item>
     </string-array>
 
+    <!-- Dialog title for the auto-advance list -->
+    <string name="prefDialogTitle_autoAdvance">Advance to</string>
+
     <!-- TODO: these pref keys that are never user visible should probably be
     moved to a donttranslate file -->
     <!-- The default auto-advance mode -->
@@ -1117,4 +1120,60 @@
         <item>@string/reply_choice_smiling_face</item>
         <item>@string/reply_choice_frowning_face</item>
     </array>
+
+    <!-- Settings screen, heading for grouping action confirmation related  settings together [CHAR LIMIT=100] -->
+    <string name="preference_header_action_confirmations">Action Confirmations</string>
+    <!--  Settings screen, confirm on action option title [CHAR LIMIT=150] -->
+    <string name="preference_confirm_before_delete_title">Confirm before deleting</string>
+    <!--  Settings screen, confirm on action option title [CHAR LIMIT=150] -->
+    <string name="preference_confirm_before_archive_title">Confirm before archiving</string>
+    <!--  Settings screen, confirm on action option title [CHAR LIMIT=150] -->
+    <string name="preference_confirm_before_send_title">Confirm before sending</string>
+
+    <!--  Settings screen, Conversation mode setting titile  [CHAR LIMIT=30] -->
+    <string name="preferences_conversation_mode_title">Auto-fit messages</string>
+    <!--  Settings screen, Conversation mode setting summary [CHAR LIMIT=70] -->
+    <string name="preferences_conversation_mode_summary">Shrink messages to fit the screen</string>
+
+    <!--  Settings screen, disable snap headers setting title  [CHAR LIMIT=30] -->
+    <string name="preferences_disable_snap_headers_title">Message actions</string>
+
+    <!-- The snap header summaries -->
+    <string-array name="prefSummaries_snapHeader">
+        <item>Always show message actions at the top of the screen</item>
+        <item>Only show message actions at the top of the screen when rotated to portrait</item>
+        <item>Don\'t show message actions outside the message header</item>
+    </string-array>
+
+    <!-- The snap header modes -->
+    <string-array name="prefEntries_snapHeader">
+        <item>Always show</item>
+        <item>Only show in portrait</item>
+        <item>Don\'t show</item>
+    </string-array>
+
+    <!-- The snap header values -->
+    <string-array translatable="false" name="prefValues_snapHeader">
+        <item>always</item>
+        <item>portrait</item>
+        <item>never</item>
+    </string-array>
+
+    <!--  Settings screen, auto advance title  [CHAR LIMIT=200]-->
+    <string name="preference_advance_to_title">Auto-advance</string>
+
+    <!-- Settings screen, title of "Clear search history" menu item -->
+    <string name="clear_history_title">Clear search history</string>
+    <!-- Message shown in toast when the user taps "clear search history" in general preferences. [CHAR LIMIT=50] -->
+    <string name="search_history_cleared">Search history cleared.</string>
+    <!-- Settings screen, title of dialog shown to confirm action when user taps
+    "Clear search history" in preferences [CHAR LIMIT=200]-->
+    <string name="clear_history_dialog_title">Clear search history?</string>
+    <!-- Settings screen, message of dialog shown to confirm action when user taps
+    "Clear search history" in preferences [CHAR LIMIT=1000]-->
+    <string name="clear_history_dialog_message">All the searches you\'ve previously performed will be removed.</string>
+
+    <!-- Settings screen, preference item to launch into Settings [CHAR LIMIT=50] -->
+    <string name="manage_accounts_menu_item">Manage Accounts</string>
+
 </resources>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
new file mode 100644
index 000000000..369d8a34f
--- /dev/null
+++ b/res/xml/general_preferences.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 Google Inc.
+     Licensed to The Android Open Source Project.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:gm="http://schemas.android.com/apk/res-auto" >
+
+    <com.android.mail.ui.settings.FancySummaryListPreference
+            android:defaultValue="@string/prefDefault_removal_action"
+            android:dialogTitle="@string/prefDialogTitle_removal_action"
+            android:entries="@array/prefEntries_removal_action"
+            android:entryValues="@array/prefValues_removal_action"
+            android:key="removal-action"
+            android:persistent="true"
+            android:title="@string/preference_removal_action_title"
+            gm:entrySummaries="@array/prefSummaries_removal_action_summary" />
+
+    <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="conversation-list-swipe"
+            android:persistent="true"
+            android:summary="@string/preference_swipe_description"
+            android:title="@string/preference_swipe_title_archive" />
+
+    <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="conversation-list-sender-image"
+            android:persistent="true"
+            android:summary="@string/preference_sender_image_description"
+            android:title="@string/preference_sender_image_title" />
+
+    <CheckBoxPreference
+            android:defaultValue="@bool/prefDefault_actionStripActionReplyAll"
+            android:key="default-reply-all"
+            android:persistent="true"
+            android:summary="@string/preferences_default_reply_all_summary"
+            android:title="@string/preferences_default_reply_all_title" />
+
+    <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="conversation-overview-mode"
+            android:persistent="true"
+            android:summary="@string/preferences_conversation_mode_summary"
+            android:title="@string/preferences_conversation_mode_title" />
+
+    <com.android.mail.ui.settings.FancySummaryListPreference
+            android:defaultValue="@string/prefDefault_autoAdvance"
+            android:dialogTitle="@string/prefDialogTitle_autoAdvance"
+            android:entries="@array/prefEntries_autoAdvance"
+            android:entryValues="@array/prefValues_autoAdvance"
+            android:key="auto-advance-widget"
+            android:persistent="false"
+            android:title="@string/preference_advance_to_title"
+            gm:entrySummaries="@array/prefSummaries_autoAdvance" />
+
+    <com.android.mail.ui.settings.FancySummaryListPreference
+            android:dialogTitle="@string/preferences_disable_snap_headers_title"
+            android:entries="@array/prefEntries_snapHeader"
+            android:entryValues="@array/prefValues_snapHeader"
+            android:key="snap-header-mode-widget"
+            android:persistent="false"
+            android:title="@string/preferences_disable_snap_headers_title"
+            gm:entrySummaries="@array/prefSummaries_snapHeader" />
+
+    <PreferenceCategory android:title="@string/preference_header_action_confirmations" >
+        <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="confirm-delete"
+                android:persistent="true"
+                android:title="@string/preference_confirm_before_delete_title" />
+        <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="confirm-archive"
+                android:persistent="true"
+                android:title="@string/preference_confirm_before_archive_title" />
+        <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="confirm-send"
+                android:persistent="true"
+                android:title="@string/preference_confirm_before_send_title" />
+    </PreferenceCategory>
+
+</PreferenceScreen>