diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-08-18 19:50:41 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-08-18 19:50:41 +0200 |
| commit | f9474aa841400850c6d676f33bd03672345d4c03 (patch) | |
| tree | 4315047cfad97aa6f6190f76743ffe8ca64f84a4 /main/res/xml | |
| parent | cd03c1b91da2b5c8cc7eb4f5617263c6aebcbd21 (diff) | |
| parent | eb15dddf8715bbc1926b8030ab4db7fbeec666cf (diff) | |
| download | cgeo-f9474aa841400850c6d676f33bd03672345d4c03.zip cgeo-f9474aa841400850c6d676f33bd03672345d4c03.tar.gz cgeo-f9474aa841400850c6d676f33bd03672345d4c03.tar.bz2 | |
Merge remote-tracking branch 'rsudev/ocpl'
Conflicts:
main/res/values/preference_keys.xml
main/src/cgeo/geocaching/settings/Settings.java
main/src/cgeo/geocaching/settings/SettingsActivity.java
Diffstat (limited to 'main/res/xml')
| -rw-r--r-- | main/res/xml/preferences.xml | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml index edfcf98..2afb1ad 100644 --- a/main/res/xml/preferences.xml +++ b/main/res/xml/preferences.xml @@ -74,13 +74,30 @@ android:layout="@layout/text_preference" android:text="@string/init_oc_de_description" android:dependency="@string/pref_connectorOCActive" /> - <cgeo.geocaching.settings.AuthorizeOcDePreference + <cgeo.geocaching.settings.AuthorizeOcPreference android:key="@string/pref_fakekey_ocde_authorization" android:dependency="@string/pref_connectorOCActive" /> </PreferenceCategory> <PreferenceCategory + android:title="@string/init_oc_pl" > + + <CheckBoxPreference + android:key="@string/pref_connectorOCPLActive" + android:title="@string/settings_activate_oc_pl" + android:defaultValue="false" /> + <cgeo.geocaching.settings.TextPreference + android:layout="@layout/text_preference" + android:text="@string/init_oc_pl_description" + android:dependency="@string/pref_connectorOCPLActive" /> + <cgeo.geocaching.settings.AuthorizeOcPreference + android:key="@string/pref_fakekey_ocpl_authorization" + android:dependency="@string/pref_connectorOCPLActive" /> + + </PreferenceCategory> + + <PreferenceCategory android:title="@string/init_gcvote" > <cgeo.geocaching.settings.EditPasswordPreference |