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

Merge "Disable "upgrade accounts" for now."

This commit is contained in:
Makoto Onuki 2010-12-16 11:09:06 -08:00 committed by Android (Google) Code Review
parent 4970392341 b358da3344
commit a9939ab165
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/email/activity/UpgradeAccounts.java
View File

@ -62,6 +62,10 @@ import java.util.ArrayList;
import java.util.HashSet;
/**
* *** Account upgrade has been disabled for the tablet release ***
*
* TODO Remove it and related code, when we no longer have to support upgrade from donut.
*
* This activity will be used whenever we have a large/slow bulk upgrade operation.
*
* The general strategy is to iterate through the legacy accounts, convert them one-by-one, and
@ -99,7 +103,7 @@ public class UpgradeAccounts extends ListActivity implements OnClickListener {
/** This projection is for looking up accounts by their legacy UUID */
private static final String WHERE_ACCOUNT_UUID_IS = AccountColumns.COMPATIBILITY_UUID + "=?";
public static void actionStart(Context context) {
private static void actionStart(Context context) {
Intent i = new Intent(context, UpgradeAccounts.class);
context.startActivity(i);
}
@ -831,10 +835,10 @@ public class UpgradeAccounts extends ListActivity implements OnClickListener {
* @return true if bulk upgrade has started. false otherwise.
*/
/* package */ static boolean doBulkUpgradeIfNecessary(Context context) {
if (bulkUpgradesRequired(context, Preferences.getPreferences(context))) {
UpgradeAccounts.actionStart(context);
return true;
}
// if (bulkUpgradesRequired(context, Preferences.getPreferences(context))) {
// UpgradeAccounts.actionStart(context);
// return true;
// }
return false;
}