roytam1/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-06-06 00:19:08 +00:00
Code Issues Projects Releases Wiki Activity

Prep tree for forward-porting Goanna, stage 1

Browse Source
This commit is contained in:
wolfbeast
2016-03-23 10:12:30 +01:00
committed by roytam1
parent 5d59e0437f
commit 5ee6187aad
1539 changed files with 7733 additions and 7733 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/android/base/preferences/MultiPrefMultiChoicePreference.java
+4 -4
View File
@@ -6,7 +6,7 @@
package org.mozilla.gecko.preferences;
import org.mozilla.gecko.R;
import org.mozilla.gecko.GeckoSharedPrefs;
import org.mozilla.gecko.GoannaSharedPrefs;
import org.mozilla.gecko.util.ThreadUtils;
import android.app.AlertDialog;
@@ -20,11 +20,11 @@ import android.util.Log;
import java.util.Set;
/* Provides backwards compatibility for some old multi-choice pref types used by Gecko.
/* Provides backwards compatibility for some old multi-choice pref types used by Goanna.
* This will import the old data from the old prefs the first time it is run.
*/
class MultiPrefMultiChoicePreference extends MultiChoicePreference {
private static final String LOGTAG = "GeckoMultiPrefPreference";
private static final String LOGTAG = "GoannaMultiPrefPreference";
private static final String IMPORT_SUFFIX = "_imported_";
private final CharSequence[] keys;
@@ -54,7 +54,7 @@ class MultiPrefMultiChoicePreference extends MultiChoicePreference {
super.loadPersistedValues();
// First check if we've already done the import the old data. If so, nothing to load.
final SharedPreferences prefs = GeckoSharedPrefs.forApp(getContext());
final SharedPreferences prefs = GoannaSharedPrefs.forApp(getContext());
final boolean imported = getPersistedBoolean(prefs, getKey() + IMPORT_SUFFIX, false);
if (imported) {
return;