Merge branch 'issue-2803' into upstream

Conflicts:
	main/res/xml/preferences.xml

1 files changed, 9 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index 707a530..84cfae8 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching.settings;
 
+import butterknife.ButterKnife;
+
 import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Intents;
@@ -130,6 +132,7 @@ public class SettingsActivity extends PreferenceActivity {
         initServicePreferences();
         initNavigationMenuPreferences();
         initMaintenanceButtons();
+        initHardwareAccelerationPreferences();
 
         for (final int k : new int[] { R.string.pref_username, R.string.pref_password,
                 R.string.pref_pass_vote, R.string.pref_signature,
@@ -380,6 +383,12 @@ public class SettingsActivity extends PreferenceActivity {
                 });
     }
 
+    public void initHardwareAccelerationPreferences() {
+        // We have to ensure that the preference is initialized so that devices with hardware acceleration disabled
+        // get the appropriate value.
+        getPreference(R.string.pref_hardware_acceleration).setDefaultValue(!Settings.HW_ACCEL_DISABLED_BY_DEFAULT);
+    }
+
     private void initDbLocationPreference() {
         final Preference p = getPreference(R.string.pref_dbonsdcard);
         p.setPersistent(false);