Merge remote-tracking branch 'schwabe/actionbar_pullrequest'

Conflicts:
	main/res/values/preference_keys.xml
	main/src/cgeo/geocaching/CgeoApplication.java

2 files changed, 15 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index 7a4dfdd..a527fc5 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -557,6 +557,10 @@ public class Settings {
         return getBoolean(R.string.pref_units, getImperialUnitsDefault());
     }
 
+    public static boolean isAlwaysShowOverlfowMenu() {
+        return getBoolean(R.string.pref_alwaysshowoverflowmenu, false);
+    }
+
     static boolean getImperialUnitsDefault() {
         final String countryCode = Locale.getDefault().getCountry();
         return "US".equals(countryCode)  // USA
diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index 8f9aad4..315c73a 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -91,8 +91,19 @@ public class SettingsActivity extends PreferenceActivity {
         SettingsActivity.addPreferencesFromResource(this, R.xml.preferences);
         initPreferences();
 
+        /* Remove the show overflow preference on Android version where the platform always or never
+         * shows the overflow menu and the app cannot influence the behaviour
+         */
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB || Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            Preference pref = findPreference(this, getString(R.string.pref_alwaysshowoverflowmenu));
+            PreferenceScreen appearence = (PreferenceScreen) findPreference(this, getString(R.string.pref_appearance));
+            appearence.removePreference(pref);
+
+        }
         Intent intent = getIntent();
         openInitialScreen(intent.getIntExtra(INTENT_OPEN_SCREEN, 0));
+
+
     }
 
     private void openInitialScreen(int initialScreen) {