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

Reply-all migration

Browse Source 
Bug: 8546815
Change-Id: I6b41aee84f0e1dfdbed4b7b2e843b6268659ee20
This commit is contained in:
Scott Kennedy 2013-05-03 18:49:51 -07:00
parent 71737836e6
commit 4994e7ca50
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/email/Preferences.java
View File

@ -57,6 +57,8 @@ public class Preferences {
@Deprecated @Deprecated
private static final String SWIPE_DELETE = "swipe_delete"; private static final String SWIPE_DELETE = "swipe_delete";
private static final String CONV_LIST_ICON = "conversation_list_icons"; private static final String CONV_LIST_ICON = "conversation_list_icons";
@Deprecated
private static final String REPLY_ALL = "reply_all";
public static final int AUTO_ADVANCE_NEWER = 0; public static final int AUTO_ADVANCE_NEWER = 0;
public static final int AUTO_ADVANCE_OLDER = 1; public static final int AUTO_ADVANCE_OLDER = 1;
@ -233,6 +235,18 @@ public class Preferences {
return mSharedPreferences.getBoolean(SWIPE_DELETE, false); return mSharedPreferences.getBoolean(SWIPE_DELETE, false);
} }
/** @deprecated Only used for migration */
@Deprecated
public boolean hasReplyAll() {
return mSharedPreferences.contains(REPLY_ALL);
}
/** @deprecated Only used for migration */
@Deprecated
public boolean getReplyAll() {
return mSharedPreferences.getBoolean(REPLY_ALL, false);
}
public int getTextZoom() { public int getTextZoom() {
return mSharedPreferences.getInt(TEXT_ZOOM, TEXT_ZOOM_DEFAULT); return mSharedPreferences.getInt(TEXT_ZOOM, TEXT_ZOOM_DEFAULT);
} }

9
src/com/android/mail/preferences/PreferenceMigrator.java
View File

@ -78,6 +78,15 @@ public class PreferenceMigrator extends BasePreferenceMigrator {
mailPrefs.setConversationListSwipeEnabled(swipeDelete); mailPrefs.setConversationListSwipeEnabled(swipeDelete);
} }
// Move reply-all setting
@SuppressWarnings("deprecation")
final boolean isReplyAllSet = preferences.hasReplyAll();
if (isReplyAllSet) {
@SuppressWarnings("deprecation")
final boolean replyAll = preferences.getReplyAll();
mailPrefs.setDefaultReplyAll(replyAll);
}
// Move folder notification settings // Move folder notification settings
for (final Account account : accounts) { for (final Account account : accounts) {
// The only setting in AccountPreferences so far is a global notification toggle, // The only setting in AccountPreferences so far is a global notification toggle,