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

Disable attachment previews 

Change-Id: Ic2314f89b813956a6351bed51bfa6881e51605ff
This commit is contained in:
Alice Yang 2013-09-13 00:43:55 -07:00
parent 24bb2dabd9
commit 17d014dfdf
3 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/xml/general_preferences.xml
View File

@ -53,16 +53,6 @@
android:entryValues="@array/prefValues_conversationListIcon" android:entryValues="@array/prefValues_conversationListIcon"
android:dialogTitle="@string/prefDialogTitle_conversationListIcon" /> android:dialogTitle="@string/prefDialogTitle_conversationListIcon" />
<!-- TODO: Uncomment this when attachment previews are fully implemented. -->
<!--
<CheckBoxPreference
android:key="conversation_list_attachment_previews"
android:persistent="false"
android:defaultValue="true"
android:title="@string/preference_attachment_previews_title"
android:summary="@string/preference_attachment_previews_description" />
-->
<!-- This may be removed in GeneralPreferences.java --> <!-- This may be removed in GeneralPreferences.java -->
<CheckBoxPreference <CheckBoxPreference
android:key="default-reply-all" android:key="default-reply-all"

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

@ -43,8 +43,6 @@ public class GeneralPreferences extends PreferenceFragment implements
private static final String PREFERENCE_KEY_CONFIRM_DELETE = "confirm_delete"; private static final String PREFERENCE_KEY_CONFIRM_DELETE = "confirm_delete";
private static final String PREFERENCE_KEY_CONFIRM_SEND = "confirm_send"; private static final String PREFERENCE_KEY_CONFIRM_SEND = "confirm_send";
private static final String PREFERENCE_KEY_CONV_LIST_ICON = "conversation_list_icon"; private static final String PREFERENCE_KEY_CONV_LIST_ICON = "conversation_list_icon";
private static final String PREFERENCE_KEY_CONV_LIST_ATTACHMENT_PREVIEWS
= "conversation_list_attachment_previews";
private MailPrefs mMailPrefs; private MailPrefs mMailPrefs;
private Preferences mPreferences; private Preferences mPreferences;
@ -118,9 +116,6 @@ public class GeneralPreferences extends PreferenceFragment implements
mMailPrefs.setShowSenderImages( mMailPrefs.setShowSenderImages(
TextUtils.equals((String)newValue, Preferences.CONV_LIST_ICON_SENDER_IMAGE)); TextUtils.equals((String)newValue, Preferences.CONV_LIST_ICON_SENDER_IMAGE));
return true; return true;
} else if (PREFERENCE_KEY_CONV_LIST_ATTACHMENT_PREVIEWS.equals(key)) {
mMailPrefs.setShowAttachmentPreviews((Boolean) newValue);
return true;
} }
return false; return false;
} }
@ -167,14 +162,6 @@ public class GeneralPreferences extends PreferenceFragment implements
mConvListIcon.setOnPreferenceChangeListener(this); mConvListIcon.setOnPreferenceChangeListener(this);
} }
// TODO: Uncomment this when attachment previews are fully implemented.
/*
mConvListAttachmentPreviews = (CheckBoxPreference) findPreference(
PREFERENCE_KEY_CONV_LIST_ATTACHMENT_PREVIEWS);
mConvListAttachmentPreviews.setChecked(mMailPrefs.getShowAttachmentPreviews());
mConvListAttachmentPreviews.setOnPreferenceChangeListener(this);
*/
mConfirmDelete = (CheckBoxPreference) findPreference(PREFERENCE_KEY_CONFIRM_DELETE); mConfirmDelete = (CheckBoxPreference) findPreference(PREFERENCE_KEY_CONFIRM_DELETE);
mConfirmSend = (CheckBoxPreference) findPreference(PREFERENCE_KEY_CONFIRM_SEND); mConfirmSend = (CheckBoxPreference) findPreference(PREFERENCE_KEY_CONFIRM_SEND);
mSwipeDelete = (CheckBoxPreference) mSwipeDelete = (CheckBoxPreference)

7
src/com/android/email/provider/EmailProvider.java
View File

@ -2716,7 +2716,7 @@ public class EmailProvider extends ContentProvider {
if (projectionColumns.contains( if (projectionColumns.contains(
UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)) { UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)) {
values.put(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS, values.put(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS,
mailPrefs.getShowAttachmentPreviews() ? "1" : "0"); "0");
} }
if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE)) { if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE)) {
int autoAdvance = prefs.getAutoAdvanceDirection(); int autoAdvance = prefs.getAutoAdvanceDirection();
@ -2958,9 +2958,8 @@ public class EmailProvider extends ContentProvider {
} }
if (colPosMap.containsKey( if (colPosMap.containsKey(
UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)) { UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)) {
values[colPosMap values[colPosMap.get(
.get(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)] = UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)] = 0;
mailPrefs.getShowAttachmentPreviews() ? 1 : 0;
} }
if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)) { if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)) {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)] = values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)] =