aboutsummaryrefslogtreecommitdiffstats
path: root/main/res/xml
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-08-28 12:37:09 +0200
committerSamuel Tardieu <sam@rfc1149.net>2014-08-28 12:37:09 +0200
commit3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f (patch)
tree3934d502ade4b8bd6b2a61f27ab1a3665d6d6322 /main/res/xml
parent2e17db77a3358e8b11da126a846d337fa6b1db90 (diff)
parentd48db1e4b122347cfa6a30e5d97b93afab5f7fb4 (diff)
downloadcgeo-3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f.zip
cgeo-3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f.tar.gz
cgeo-3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f.tar.bz2
Merge branch 'issue-2803' into upstream
Conflicts: main/res/xml/preferences.xml
Diffstat (limited to 'main/res/xml')
-rw-r--r--main/res/xml/preferences.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml
index 82c8f13..78d79bd 100644
--- a/main/res/xml/preferences.xml
+++ b/main/res/xml/preferences.xml
@@ -764,6 +764,15 @@
android:key="@string/pref_lowpowermode"
android:title="@string/init_low_power_mode" />
</PreferenceCategory>
+ <PreferenceCategory android:title="@string/init_hardware_acceleration_title">
+ <cgeo.geocaching.settings.TextPreference
+ android:layout="@layout/text_preference"
+ android:text="@string/init_hardware_acceleration_note" />
+
+ <CheckBoxPreference
+ android:key="@string/pref_hardware_acceleration"
+ android:title="@string/init_hardware_acceleration" />
+ </PreferenceCategory>
<PreferenceCategory android:title="@string/init_debug_title" >
<cgeo.geocaching.settings.TextPreference
android:layout="@layout/text_preference"