diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-05-18 07:57:12 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-05-18 07:57:12 +0200 |
| commit | 5fcce648e200669f1ae0875c7aea9dc3a4a37574 (patch) | |
| tree | f3741fdf0c8fcb6e6728fa49d61af7ea6c7f1aaa /main/res/xml | |
| parent | 6b2972bfd1fdc14cd84f78e3674e97b46675345d (diff) | |
| parent | 786eccacbb285696d504d08ba02c61400ce063a2 (diff) | |
| download | cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.zip cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.tar.gz cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.tar.bz2 | |
Merge remote-tracking branch 'schwabe/actionbar_pullrequest'
Conflicts:
main/res/values/preference_keys.xml
main/src/cgeo/geocaching/CgeoApplication.java
Diffstat (limited to 'main/res/xml')
| -rw-r--r-- | main/res/xml/preferences.xml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml index 3e32b72..124bd0d 100644 --- a/main/res/xml/preferences.xml +++ b/main/res/xml/preferences.xml @@ -375,6 +375,7 @@ </PreferenceCategory> </PreferenceScreen> <PreferenceScreen + android:key="@string/pref_appearance" android:icon="?attr/settings_eye" android:title="@string/settings_title_appearance" > <CheckBoxPreference @@ -402,6 +403,12 @@ android:key="@string/pref_units" android:summary="@string/init_summary_units" android:title="@string/init_units" /> + <!-- this preference is only shown on < 4.4 devices, 4.4 unconditionally enables it --> + <CheckBoxPreference + android:title="@string/init_showoverflowmenu" + android:summary="@string/init_showoverflow_summary" + android:key="@string/pref_alwaysshowoverflowmenu" + android:defaultValue="false" /> </PreferenceScreen> <PreferenceScreen android:icon="?attr/settings_details" @@ -739,4 +746,4 @@ </PreferenceCategory> </PreferenceScreen> -</PreferenceScreen>
\ No newline at end of file +</PreferenceScreen> |