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

Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion

Browse Source
This commit is contained in:
Jon Atkins 2014-03-04 18:43:43 +00:00
commit e261784315
2 changed files with 10 additions and 3 deletions
Show Stats 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

5
mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
View File

@ -17,6 +17,7 @@ import android.widget.Toast;
import com.cradle.iitc_mobile.async.CheckHttpResponse;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
@ -214,7 +215,9 @@ public class IITC_WebView extends WebView {
}
void updateFullscreenStatus() {
final Set<String> entries = mSharedPrefs.getStringSet("pref_fullscreen", new HashSet<String>());
final String[] fullscreenDefaults = getResources().getStringArray(R.array.pref_hide_fullscreen_defaults);
final Set<String> entries = mSharedPrefs.getStringSet("pref_fullscreen",
new HashSet<String>(Arrays.asList(fullscreenDefaults)));
mFullscreenStatus &= FS_ENABLED;
for (final String entry : entries) {