ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am a1b06623: am c726d4fa: Add "Reply all" setting to tablets

Browse Source 
* commit 'a1b066231b8cf8e8446416b80ee922a55083a807':
  Add "Reply all" setting to tablets
This commit is contained in:
Scott Kennedy 2013-04-24 18:28:07 -07:00 committed by Android Git Automerger
commit cc2d942509
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@ -1162,11 +1162,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- General preference: Text zoom. Value is "huge" (+2) [CHAR LIMIT=32] --> <!-- General preference: Text zoom. Value is "huge" (+2) [CHAR LIMIT=32] -->
<string name="general_preference_text_zoom_huge">Huge</string> <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 <!-- Settings screen, title used to clear the setting for the list of
senders to automatically show pictures for [CHAR LIMIT=80] --> senders to automatically show pictures for [CHAR LIMIT=80] -->
<string name="general_preferences_clear_trusted_senders_title" <string name="general_preferences_clear_trusted_senders_title"

4
res/xml/general_preferences.xml
View File

@ -60,8 +60,8 @@
android:key="default-reply-all" android:key="default-reply-all"
android:persistent="false" android:persistent="false"
android:defaultValue="false" android:defaultValue="false"
android:title="@string/general_preference_reply_all_label" android:title="@string/preferences_default_reply_all_title"
android:summary="@string/general_preference_reply_all_summary" /> android:summary="@string/preferences_default_reply_all_summary" />
<CheckBoxPreference <CheckBoxPreference
android:key="conversation-list-swipe" android:key="conversation-list-swipe"

8
src/com/android/email/activity/setup/GeneralPreferences.java
View File

@ -72,11 +72,6 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
final PreferenceScreen ps = getPreferenceScreen(); final PreferenceScreen ps = getPreferenceScreen();
// Merely hide app pref for font size until we're sure it's unnecessary (b/5287963) // Merely hide app pref for font size until we're sure it's unnecessary (b/5287963)
ps.removePreference(findPreference(PREFERENCE_KEY_TEXT_ZOOM)); 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 @Override
@ -170,11 +165,8 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
final CheckBoxPreference replyAllPreference = final CheckBoxPreference replyAllPreference =
(CheckBoxPreference) findPreference(MailPrefs.PreferenceKeys.DEFAULT_REPLY_ALL); (CheckBoxPreference) findPreference(MailPrefs.PreferenceKeys.DEFAULT_REPLY_ALL);
// This preference is removed on tablets
if (replyAllPreference != null) {
replyAllPreference.setChecked(mMailPrefs.getDefaultReplyAll()); replyAllPreference.setChecked(mMailPrefs.getDefaultReplyAll());
replyAllPreference.setOnPreferenceChangeListener(this); replyAllPreference.setOnPreferenceChangeListener(this);
}
reloadDynamicSummaries(); reloadDynamicSummaries();
} }