phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use correct default values for MultiSelectListPreference outside of xml

Browse Source
This commit is contained in:
Philipp Schaefer
2014-03-04 00:30:35 +01:00
parent 03cabcbdb6
commit 1103a409c0
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
View File

@ -49,6 +49,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.Stack;
@ -137,7 +138,8 @@ public class IITC_Mobile extends Activity
mDesktopMode = mSharedPrefs.getBoolean("pref_force_desktop", false);
// enable/disable advance menu
mAdvancedMenu = mSharedPrefs.getStringSet("pref_android_menu", new HashSet<String>());
final String[] menuDefaults = getResources().getStringArray(R.array.pref_android_menu_default);
mAdvancedMenu = mSharedPrefs.getStringSet("pref_android_menu", new HashSet<String>(Arrays.asList(menuDefaults)));
// get fullscreen status from settings
mIitcWebView.updateFullscreenStatus();
@ -180,7 +182,9 @@ public class IITC_Mobile extends Activity
mNavigationHelper.onPrefChanged();
return;
} else if (key.equals("pref_android_menu")) {
mAdvancedMenu = mSharedPrefs.getStringSet("pref_android_menu", new HashSet<String>());
final String[] menuDefaults = getResources().getStringArray(R.array.pref_android_menu_default);
mAdvancedMenu = mSharedPrefs.getStringSet("pref_android_menu",
new HashSet<String>(Arrays.asList(menuDefaults)));
mNavigationHelper.setDebugMode(mAdvancedMenu.contains(R.string.menu_debug));
invalidateOptionsMenu();
// no reload needed