diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-08-28 12:37:09 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-08-28 12:37:09 +0200 |
| commit | 3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f (patch) | |
| tree | 3934d502ade4b8bd6b2a61f27ab1a3665d6d6322 /main/res | |
| parent | 2e17db77a3358e8b11da126a846d337fa6b1db90 (diff) | |
| parent | d48db1e4b122347cfa6a30e5d97b93afab5f7fb4 (diff) | |
| download | cgeo-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')
| -rw-r--r-- | main/res/values/preference_keys.xml | 1 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | main/res/xml/preferences.xml | 9 |
3 files changed, 13 insertions, 0 deletions
diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml index e8840f5..2fe8774 100644 --- a/main/res/values/preference_keys.xml +++ b/main/res/values/preference_keys.xml @@ -180,4 +180,5 @@ <string name="pref_appearance">pref_appearance</string> <string name="pref_changelog_last_checksum">changelog_last_checksum</string> <string name="pref_caches_history">caches_history</string> + <string name="pref_hardware_acceleration">hardware_acceleration</string> </resources> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 32249dd..c4cfb85 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -538,6 +538,9 @@ <string name="init_create_memory_dump">Create memory dump</string> <string name="init_memory_dump">Memory dump</string> <string name="init_memory_dumped">Memory dumped to %s</string> + <string name="init_hardware_acceleration_title">Hardware accelerated rendering</string> + <string name="init_hardware_acceleration_note">Hardware acceleration renders graphical elements faster on the screen. However on some devices the Android operating system contains bugs and some text may appear blurred (notably bold characters). Disable hardware acceleration if this happens to you.</string> + <string name="init_hardware_acceleration">Enable hardware acceleration</string> <string name="settings_open_website">Open website</string> <string name="settings_settings">Settings</string> <string name="settings_information">Information</string> 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" |