summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-zh-rCN/cm_strings.xml1
-rw-r--r--res/values-zh-rHK/cm_strings.xml1
-rw-r--r--res/values-zh-rTW/cm_strings.xml1
-rw-r--r--res/values/cm_strings.xml2
-rw-r--r--res/xml/general_preferences.xml6
-rw-r--r--src/com/android/email/Preferences.java11
-rw-r--r--src/com/android/email/activity/setup/GeneralPreferences.java7
-rw-r--r--src/com/android/email/provider/EmailProvider.java11
8 files changed, 39 insertions, 1 deletions
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index c59c24322..8f86f659d 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -44,4 +44,5 @@
<string name="category_label_enhancement_settings">附加设置</string>
<string name="general_preference_add_attachment_label">添加任意文件为附件</string>
<string name="general_preference_select_recipients_label">从联系人中选择收件人</string>
+ <string name="general_preference_confirm_forward_label">转发前先确认</string>
</resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 8bae8e1c7..51707034a 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -34,4 +34,5 @@
<string name="category_label_enhancement_settings">附加設定</string>
<string name="general_preference_add_attachment_label">附加任意文件為附件</string>
<string name="general_preference_select_recipients_label">從聯繫人中選擇收件人</string>
+ <string name="general_preference_confirm_forward_label">轉寄前須確認</string>
</resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 8bae8e1c7..51707034a 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -34,4 +34,5 @@
<string name="category_label_enhancement_settings">附加設定</string>
<string name="general_preference_add_attachment_label">附加任意文件為附件</string>
<string name="general_preference_select_recipients_label">從聯繫人中選擇收件人</string>
+ <string name="general_preference_confirm_forward_label">轉寄前須確認</string>
</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 26dd4f20a..9f68d4048 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -63,4 +63,6 @@
<string name="general_preference_add_attachment_label">Add any file as attachment</string>
<!-- General preference: Label of the setting for select recipients from Contact CHAR LIMIT=32] -->
<string name="general_preference_select_recipients_label">Select recipients from Contact</string>
+ <!-- General preference: Label of the setting for confirm before forward CHAR LIMIT=32] -->
+ <string name="general_preference_confirm_forward_label">Confirm before forwarding</string>
</resources>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index cabcbdc9c..9f4e9b872 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -78,6 +78,12 @@
android:title="@string/category_label_enhancement_settings">
<CheckBoxPreference
+ android:key="confirm_forward"
+ android:persistent="true"
+ android:defaultValue="false"
+ android:title="@string/general_preference_confirm_forward_label" />
+
+ <CheckBoxPreference
android:key="add_attachment"
android:persistent="true"
android:defaultValue="true"
diff --git a/src/com/android/email/Preferences.java b/src/com/android/email/Preferences.java
index 65974ab6a..ab713efb6 100644
--- a/src/com/android/email/Preferences.java
+++ b/src/com/android/email/Preferences.java
@@ -61,6 +61,8 @@ public class Preferences {
@Deprecated
private static final String REPLY_ALL = "reply_all";
+ // Enhancement settings
+ private static final String CONFIRM_FORWARD = "confirm_forward";
private static final String ADD_ATTACHMENT = "add_attachment";
private static final String SELECT_RECIPIENTS = "select_recipients";
@@ -85,6 +87,7 @@ public class Preferences {
public static final String CONV_LIST_ICON_NONE = "none";
public static final String CONV_LIST_ICON_DEFAULT = CONV_LIST_ICON_SENDER_IMAGE;
+ private static final boolean CONFIRM_FORWARD_DEFAULT = false;
private static final boolean ADD_ATTACHMENT_DEFAULT = true;
private static final boolean SELECT_RECIPIENTS_DEFAULT = true;
@@ -245,6 +248,14 @@ public class Preferences {
return mSharedPreferences.getBoolean(REPLY_ALL, false);
}
+ public boolean getConfirmForward() {
+ return mSharedPreferences.getBoolean(CONFIRM_FORWARD, CONFIRM_FORWARD_DEFAULT);
+ }
+
+ public void setConfirmForward(boolean set) {
+ mSharedPreferences.edit().putBoolean(CONFIRM_FORWARD, set).apply();
+ }
+
public boolean getAddAttachmentEnabled() {
return mSharedPreferences.getBoolean(ADD_ATTACHMENT, ADD_ATTACHMENT_DEFAULT);
}
diff --git a/src/com/android/email/activity/setup/GeneralPreferences.java b/src/com/android/email/activity/setup/GeneralPreferences.java
index a99be8049..9599b9535 100644
--- a/src/com/android/email/activity/setup/GeneralPreferences.java
+++ b/src/com/android/email/activity/setup/GeneralPreferences.java
@@ -43,6 +43,7 @@ public class GeneralPreferences extends PreferenceFragment 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_CONFIRM_FORWARD = "confirm_forward";
private static final String PREFERENCE_KEY_ADD_ATTACHMENT = "add_attachment";
private static final String PREFERENCE_KEY_SELECT_RECIPIENTS = "select_recipients";
@@ -60,6 +61,7 @@ public class GeneralPreferences extends PreferenceFragment implements
//private CheckBoxPreference mConvListAttachmentPreviews;
private CheckBoxPreference mSwipeDelete;
+ private CheckBoxPreference mConfirmForward;
private CheckBoxPreference mAddAttachment;
private CheckBoxPreference mSelectRecipients;
@@ -139,6 +141,9 @@ public class GeneralPreferences extends PreferenceFragment implements
} else if (MailPrefs.PreferenceKeys.CONVERSATION_LIST_SWIPE.equals(key)) {
mMailPrefs.setConversationListSwipeEnabled(mSwipeDelete.isChecked());
return true;
+ } else if (PREFERENCE_KEY_CONFIRM_FORWARD.equals(key)) {
+ mPreferences.setConfirmForward(mConfirmForward.isChecked());
+ return true;
} else if (PREFERENCE_KEY_ADD_ATTACHMENT.equals(key)) {
mPreferences.setAddAttachmentEnabled(mAddAttachment.isChecked());
return true;
@@ -180,6 +185,8 @@ public class GeneralPreferences extends PreferenceFragment implements
replyAllPreference.setChecked(mMailPrefs.getDefaultReplyAll());
replyAllPreference.setOnPreferenceChangeListener(this);
+ mConfirmForward = (CheckBoxPreference) findPreference(PREFERENCE_KEY_CONFIRM_FORWARD);
+ mConfirmForward.setChecked(mPreferences.getConfirmForward());
mAddAttachment = (CheckBoxPreference) findPreference(PREFERENCE_KEY_ADD_ATTACHMENT);
mAddAttachment.setChecked(mPreferences.getAddAttachmentEnabled());
mSelectRecipients = (CheckBoxPreference) findPreference(PREFERENCE_KEY_SELECT_RECIPIENTS);
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 8cfed71ae..52f61a989 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -3047,7 +3047,8 @@ public class EmailProvider extends ContentProvider {
AccountCapabilities.FOLDER_SERVER_SEARCH |
AccountCapabilities.SMART_REPLY |
AccountCapabilities.UNDO |
- AccountCapabilities.DISCARD_CONVERSATION_DRAFTS;
+ AccountCapabilities.DISCARD_CONVERSATION_DRAFTS |
+ AccountCapabilities.SMART_FORWARD;
} else {
capabilities = AccountCapabilities.SYNCABLE_FOLDERS |
AccountCapabilities.SMART_REPLY |
@@ -3118,6 +3119,10 @@ public class EmailProvider extends ContentProvider {
values.put(UIProvider.AccountColumns.SettingsColumns.CONFIRM_SEND,
prefs.getConfirmSend() ? "1" : "0");
}
+ if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.CONFIRM_FORWARD)) {
+ values.put(UIProvider.AccountColumns.SettingsColumns.CONFIRM_FORWARD,
+ prefs.getConfirmForward() ? "1" : "0");
+ }
if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.ADD_ATTACHMENT)) {
values.put(UIProvider.AccountColumns.SettingsColumns.ADD_ATTACHMENT,
prefs.getAddAttachmentEnabled() ? "1" : "0");
@@ -3406,6 +3411,10 @@ public class EmailProvider extends ContentProvider {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONFIRM_SEND)] =
prefs.getConfirmSend() ? 1 : 0;
}
+ if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.CONFIRM_FORWARD)) {
+ values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONFIRM_FORWARD)] =
+ prefs.getConfirmForward() ? 1 : 0;
+ }
if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.ADD_ATTACHMENT)) {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.ADD_ATTACHMENT)] =
prefs.getAddAttachmentEnabled() ? 1 : 0;
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-01 21:43:19 +0000