From c726d4fa6cd5239f9b902e954efaab7752d26471 Mon Sep 17 00:00:00 2001
From: Scott Kennedy <skennedy@google.com>
Date: Wed, 24 Apr 2013 18:15:19 -0700
Subject: [PATCH] Add "Reply all" setting to tablets

This controls the notification action on tablets.

Change-Id: I0b8df2ded371820f0dada3f1b11cebad462962ed
---
 res/values/strings.xml                               |  5 -----
 res/xml/general_preferences.xml                      |  4 ++--
 .../email/activity/setup/GeneralPreferences.java     | 12 ++----------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5dadf3fd8..92adc598e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1162,11 +1162,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <!-- General preference:  Text zoom.  Value is "huge" (+2) [CHAR LIMIT=32] -->
     <string name="general_preference_text_zoom_huge">Huge</string>
 
-    <!--  Settings screen, Reply to all default setting title  [CHAR LIMIT=30] -->
-    <string msgid="6469564953937885304" name="general_preference_reply_all_label">Reply all</string>
-    <!--  Settings screen, Reply to all default setting summary [CHAR LIMIT=70] -->
-    <string msgid="3356918650886350497" name="general_preference_reply_all_summary">Make \"Reply all\" the default for message replies</string>
-
     <!-- Settings screen, title used to clear the setting for the list of
          senders to automatically show pictures for [CHAR LIMIT=80] -->
     <string name="general_preferences_clear_trusted_senders_title"
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 4223170f0..648eec0f0 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -60,8 +60,8 @@
         android:key="default-reply-all"
         android:persistent="false"
         android:defaultValue="false"
-        android:title="@string/general_preference_reply_all_label"
-        android:summary="@string/general_preference_reply_all_summary" />
+        android:title="@string/preferences_default_reply_all_title"
+        android:summary="@string/preferences_default_reply_all_summary" />
 
     <CheckBoxPreference
         android:key="conversation-list-swipe"
diff --git a/src/com/android/email/activity/setup/GeneralPreferences.java b/src/com/android/email/activity/setup/GeneralPreferences.java
index d57375065..6e2576b86 100644
--- a/src/com/android/email/activity/setup/GeneralPreferences.java
+++ b/src/com/android/email/activity/setup/GeneralPreferences.java
@@ -72,11 +72,6 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
         final PreferenceScreen ps = getPreferenceScreen();
         // Merely hide app pref for font size until we're sure it's unnecessary (b/5287963)
         ps.removePreference(findPreference(PREFERENCE_KEY_TEXT_ZOOM));
-
-        // Disabling reply-all on tablets, as this setting is just for phones
-        if (Utils.useTabletUI(getActivity().getResources())) {
-            ps.removePreference(findPreference(MailPrefs.PreferenceKeys.DEFAULT_REPLY_ALL));
-        }
     }
 
     @Override
@@ -170,11 +165,8 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
 
         final CheckBoxPreference replyAllPreference =
                 (CheckBoxPreference) findPreference(MailPrefs.PreferenceKeys.DEFAULT_REPLY_ALL);
-        // This preference is removed on tablets
-        if (replyAllPreference != null) {
-            replyAllPreference.setChecked(mMailPrefs.getDefaultReplyAll());
-            replyAllPreference.setOnPreferenceChangeListener(this);
-        }
+        replyAllPreference.setChecked(mMailPrefs.getDefaultReplyAll());
+        replyAllPreference.setOnPreferenceChangeListener(this);
 
         reloadDynamicSummaries();
     }