Merge branch 'issue-2803' into upstream

Conflicts:
	main/res/xml/preferences.xml

1 files changed, 13 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index fdcd94f..edc5f21 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -34,6 +34,7 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.os.Build;
 import android.os.Environment;
 import android.preference.PreferenceManager;
 
@@ -53,6 +54,10 @@ public class Settings {
     public static final int SHOW_WP_THRESHOLD_MAX = 50;
     private static final int MAP_SOURCE_DEFAULT = GoogleMapProvider.GOOGLE_MAP_ID.hashCode();
 
+    public static final boolean HW_ACCEL_DISABLED_BY_DEFAULT =
+            StringUtils.equals(Build.MODEL, "HTC One X") ||    // HTC One X
+            StringUtils.equals(Build.MODEL, "GT-I8190");       // Samsung S3 mini
+
     private final static int unitsMetric = 1;
 
     // twitter api keys
@@ -1033,4 +1038,12 @@ public class Settings {
         history.add(0, geocode);
         putString(R.string.pref_caches_history, StringUtils.join(history, HISTORY_SEPARATOR));
     }
+
+    public static boolean useHardwareAcceleration() {
+        return getBoolean(R.string.pref_hardware_acceleration, !HW_ACCEL_DISABLED_BY_DEFAULT);
+    }
+
+    public static boolean setUseHardwareAcceleration(final boolean useHardwareAcceleration) {
+        return putBoolean(R.string.pref_hardware_acceleration, useHardwareAcceleration);
+    }
 }