diff options
| -rw-r--r-- | main/res/xml/preferences.xml | 1 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/settings/Settings.java | 7 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/settings/SettingsActivity.java | 9 |
3 files changed, 15 insertions, 2 deletions
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml index 59055ca..1ed739d 100644 --- a/main/res/xml/preferences.xml +++ b/main/res/xml/preferences.xml @@ -751,7 +751,6 @@ android:text="@string/init_hardware_acceleration_note" /> <CheckBoxPreference - android:defaultValue="true" android:key="@string/pref_hardware_acceleration" android:title="@string/init_hardware_acceleration" /> </PreferenceCategory> diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java index 16050cb..7d3bf9c 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 @@ -1036,7 +1041,7 @@ public class Settings { } public static boolean useHardwareAcceleration() { - return getBoolean(R.string.pref_hardware_acceleration, true); + return getBoolean(R.string.pref_hardware_acceleration, !HW_ACCEL_DISABLED_BY_DEFAULT); } public static boolean setUseHardwareAcceleration(final boolean useHardwareAcceleration) { diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java index 98ca4bf..94f5909 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; @@ -129,6 +131,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, @@ -378,6 +381,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); |