diff --git a/mobile/res/menu/main.xml b/mobile/res/menu/main.xml index ef80fd10..28edf143 100644 --- a/mobile/res/menu/main.xml +++ b/mobile/res/menu/main.xml @@ -13,25 +13,25 @@ android:icon="@drawable/ic_action_location_found" android:orderInCategory="100" android:showAsAction="ifRoom" - android:title="@string/locate"/> + android:title="@string/menu_locate"/> + android:title="@string/menu_layer_chooser"/> + android:title="@string/menu_toggle_fullscreen"/> + android:title="@string/menu_reload"/> Settings Show navigation menu Hide navigation menu - Reload IITC Print Version - Toggle fullscreen - Layer Chooser - Get Location local Close Downloading latest intel package… @@ -128,13 +124,12 @@ Enable developer mode If enabled, all IITC sources will be loaded from external storage of the Android device. Please copy all sources from $IITC_folder/build/mobile/ to /sdcard/IITC_Mobile/dev/. - Display advanced menu - In addition to the default IITC buttons the advanced menu - contains a debug pane plus an option to clear cookies Disable Splash Screen Fake User Agent Let IITCm appear as a desktop browser for the intel site. Note: If just want to use the desktop mode use the \'force desktop mode\' setting + Configure IITCm menu + Toggle visibility of IITCm menu entries System Bar @@ -148,6 +143,30 @@ 8 16 + + 2 + 4 + + + + @string/menu_search + @string/menu_locate + @string/menu_layer_chooser + @string/menu_toggle_fullscreen + @string/menu_reload + @string/menu_send_screenshot + @string/menu_clear_cookies + @string/menu_debug + + + @string/menu_search + @string/menu_locate + @string/menu_layer_chooser + @string/menu_toggle_fullscreen + @string/menu_reload + @string/menu_send_screenshot + + Don\'t show user position Show user position on map @@ -159,6 +178,10 @@ 2 + Reload IITC + Toggle fullscreen + Layer Chooser + Get Location Clear Cookies Search Debug diff --git a/mobile/res/xml/preferences.xml b/mobile/res/xml/preferences.xml index b1d97c5d..dbea9820 100644 --- a/mobile/res/xml/preferences.xml +++ b/mobile/res/xml/preferences.xml @@ -18,9 +18,11 @@ android:title="@string/pref_user_zoom"/> @@ -77,11 +79,14 @@ - + mResponseHandlers = new Vector(); private boolean mDesktopMode = false; - private boolean mAdvancedMenu = false; + private Set mAdvancedMenu; private MenuItem mSearchMenuItem; private View mImageLoading; private ListView mLvDebug; @@ -135,7 +137,7 @@ public class IITC_Mobile extends Activity mDesktopMode = mSharedPrefs.getBoolean("pref_force_desktop", false); // enable/disable advance menu - mAdvancedMenu = mSharedPrefs.getBoolean("pref_advanced_menu", false); + mAdvancedMenu = mSharedPrefs.getStringSet("pref_android_menu", new HashSet()); // get fullscreen status from settings mIitcWebView.updateFullscreenStatus(); @@ -177,9 +179,9 @@ public class IITC_Mobile extends Activity mIitcWebView.updateFullscreenStatus(); mNavigationHelper.onPrefChanged(); return; - } else if (key.equals("pref_advanced_menu")) { - mAdvancedMenu = sharedPreferences.getBoolean("pref_advanced_menu", false); - mNavigationHelper.setDebugMode(mAdvancedMenu); + } else if (key.equals("pref_android_menu")) { + mAdvancedMenu = mSharedPrefs.getStringSet("pref_android_menu", new HashSet()); + mNavigationHelper.setDebugMode(mAdvancedMenu.contains(R.string.menu_debug)); invalidateOptionsMenu(); // no reload needed return; @@ -505,12 +507,8 @@ public class IITC_Mobile extends Activity item.setVisible(true); break; - case R.id.menu_clear_cookies: - item.setVisible(mAdvancedMenu && visible); - break; - case R.id.locate: - item.setVisible(visible); + item.setVisible(mAdvancedMenu.contains(item.getTitle()) && visible); item.setEnabled(!mIsLoading); item.setIcon(mUserLocation.isFollowing() ? R.drawable.ic_action_location_follow @@ -518,12 +516,12 @@ public class IITC_Mobile extends Activity break; case R.id.menu_debug: - item.setVisible(mAdvancedMenu && visible); + item.setVisible(mAdvancedMenu.contains(item.getTitle()) && visible); item.setChecked(mDebugging); break; default: - item.setVisible(visible); + item.setVisible(mAdvancedMenu.contains(item.getTitle()) && visible); } } diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java index c2598738..48253429 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java @@ -217,10 +217,6 @@ public class IITC_WebView extends WebView { final Set entries = mSharedPrefs.getStringSet("pref_fullscreen", new HashSet()); mFullscreenStatus &= FS_ENABLED; - // default values...android has no nice way to add default values to multiSelectListPreferences - if (entries.isEmpty()) { - mFullscreenStatus += FS_ACTIONBAR | FS_SYSBAR; - } for (final String entry : entries) { mFullscreenStatus += Integer.parseInt(entry); }