corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backout c38e96f197e5, 7e795daed2f7, d74e5dfa1626, a942ab4e7089, 28754a456feb & d3da23241bba (bug 710330) for failures in test_localStorageOriginsDomainDiffs.html

Browse Source
This commit is contained in:
Ed Morley
2012-06-25 17:27:32 +01:00
parent b908e28a8f
commit 42c8e3be61
12 changed files with 235 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
mobile/android/base/AndroidImportPreference.java
View File

@@ -1,106 +0,0 @@
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.ProgressDialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.preference.DialogPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.util.AttributeSet;
import android.util.Log;
import android.util.SparseBooleanArray;
import org.mozilla.gecko.R;
class AndroidImportPreference extends DialogPreference {
static final private String LOGTAG = "AndroidImport";
private Context mContext;
private boolean mBookmarksChecked;
private boolean mHistoryChecked;
public AndroidImportPreference(Context context, AttributeSet attrs) {
super(context, attrs);
mContext = context;
}
protected void runImport(final boolean doBookmarks, final boolean doHistory) {
Log.i(LOGTAG, "Importing Android history/bookmarks");
if (!doBookmarks && !doHistory) {
return;
}
final String dialogTitle;
if (doBookmarks && doHistory) {
dialogTitle = mContext.getString(R.string.bookmarkhistory_import_both);
} else if (doBookmarks) {
dialogTitle = mContext.getString(R.string.bookmarkhistory_import_bookmarks);
} else {
dialogTitle = mContext.getString(R.string.bookmarkhistory_import_history);
}
final ProgressDialog dialog =
ProgressDialog.show(mContext,
dialogTitle,
mContext.getString(R.string.bookmarkhistory_import_wait),
true);
final Runnable stopCallback = new Runnable() {
public void run() {
GeckoApp.mAppContext.runOnUiThread(new Runnable() {
public void run() {
dialog.dismiss();
}
});
}
};
GeckoBackgroundThread.getHandler().post(
// Constructing AndroidImport may need finding the profile,
// which hits disk, so it needs to go into a Runnable too.
new Runnable() {
public void run() {
new AndroidImport(mContext, stopCallback, doBookmarks, doHistory).run();
}
}
);
}
@Override
protected void onPrepareDialogBuilder(Builder builder) {
super.onPrepareDialogBuilder(builder);
mBookmarksChecked = true;
mHistoryChecked = true;
builder.setMultiChoiceItems(R.array.pref_android_import_select,
new boolean[] { mBookmarksChecked, mHistoryChecked },
new DialogInterface.OnMultiChoiceClickListener() {
@Override
public void onClick(DialogInterface dialog,
int which,
boolean isChecked) {
Log.i(LOGTAG, "which = " + which + ", checked=" + isChecked);
if (which == 0) {
mBookmarksChecked = isChecked;
} else if (which == 1) {
mHistoryChecked = isChecked;
}
}
}
);
}
@Override
protected void onDialogClosed(boolean positiveResult) {
if (!positiveResult)
return;
runImport(mBookmarksChecked, mHistoryChecked);
}
}