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

Add a setting for attachment previews. 

Bug: 10131520
Change-Id: I782b331971272203d1b36a578cf6a149793b10e6
This commit is contained in:
Mark Wei 2013-08-06 18:20:45 -07:00
parent c3ceed6894
commit 034149b586
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
res/xml/general_preferences.xml
View File

@ -55,6 +55,13 @@
android:entryValues="@array/prefValues_conversationListIcon"
android:dialogTitle="@string/prefDialogTitle_conversationListIcon" />
<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 -->
<CheckBoxPreference
android:key="default-reply-all"

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

@ -42,6 +42,8 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
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_CONV_LIST_ICON = "conversation_list_icon";
private static final String PREFERENCE_KEY_CONV_LIST_ATTACHMENT_PREVIEWS
= "conversation_list_attachment_previews";
private MailPrefs mMailPrefs;
private Preferences mPreferences;
@ -55,6 +57,7 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
private CheckBoxPreference mConfirmDelete;
private CheckBoxPreference mConfirmSend;
private ListPreference mConvListIcon;
private CheckBoxPreference mConvListAttachmentPreviews;
private CheckBoxPreference mSwipeDelete;
private boolean mSettingsChanged = false;
@ -113,6 +116,9 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
mMailPrefs.setShowSenderImages(
TextUtils.equals((String)newValue, Preferences.CONV_LIST_ICON_SENDER_IMAGE));
return true;
} else if (PREFERENCE_KEY_CONV_LIST_ATTACHMENT_PREVIEWS.equals(key)) {
mMailPrefs.setShowAttachmentPreviews((Boolean) newValue);
return true;
}
return false;
}
@ -159,6 +165,11 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
mConvListIcon.setOnPreferenceChangeListener(this);
}
mConvListAttachmentPreviews = (CheckBoxPreference) findPreference(
PREFERENCE_KEY_CONV_LIST_ATTACHMENT_PREVIEWS);
mConvListAttachmentPreviews.setChecked(mMailPrefs.getShowAttachmentPreviews());
mConvListAttachmentPreviews.setOnPreferenceChangeListener(this);
mConfirmDelete = (CheckBoxPreference) findPreference(PREFERENCE_KEY_CONFIRM_DELETE);
mConfirmSend = (CheckBoxPreference) findPreference(PREFERENCE_KEY_CONFIRM_SEND);
mSwipeDelete = (CheckBoxPreference)

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

@ -87,6 +87,7 @@ import com.android.mail.providers.Folder;
import com.android.mail.providers.FolderList;
import com.android.mail.providers.UIProvider;
import com.android.mail.providers.UIProvider.AccountCapabilities;
import com.android.mail.providers.UIProvider.AccountColumns.SettingsColumns;
import com.android.mail.providers.UIProvider.AccountCursorExtraKeys;
import com.android.mail.providers.UIProvider.ConversationPriority;
import com.android.mail.providers.UIProvider.ConversationSendingState;
@ -2566,6 +2567,11 @@ public class EmailProvider extends ContentProvider {
values.put(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ICON,
getConversationListIcon(mailPrefs));
}
if (projectionColumns.contains(
UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)) {
values.put(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS,
mailPrefs.getShowAttachmentPreviews() ? "1" : "0");
}
if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE)) {
int autoAdvance = prefs.getAutoAdvanceDirection();
values.put(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE,
@ -2797,6 +2803,12 @@ public class EmailProvider extends ContentProvider {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ICON)] =
getConversationListIcon(mailPrefs);
}
if (colPosMap.containsKey(
UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)) {
values[colPosMap
.get(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)] =
mailPrefs.getShowAttachmentPreviews() ? 1 : 0;
}
if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)) {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)] =
prefs.getConfirmDelete() ? 1 : 0;