diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-08-18 15:37:56 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-08-18 15:37:56 +0200 |
| commit | 8fd7c4eedabbf77c9d4131503d122c55a23b070f (patch) | |
| tree | c294ced16cecb4b4a97736a25b01cb329a635fa3 /main | |
| parent | b2a455ce984672365aec6e1538c7fbd5b9118421 (diff) | |
| download | cgeo-8fd7c4eedabbf77c9d4131503d122c55a23b070f.zip cgeo-8fd7c4eedabbf77c9d4131503d122c55a23b070f.tar.gz cgeo-8fd7c4eedabbf77c9d4131503d122c55a23b070f.tar.bz2 | |
fix #3119: Have settings active by default
Diffstat (limited to 'main')
| -rw-r--r-- | main/res/xml/preferences.xml | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/settings/Settings.java | 18 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/settings/SettingsActivity.java | 1 |
3 files changed, 18 insertions, 3 deletions
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml index 7cf3385..edfcf98 100644 --- a/main/res/xml/preferences.xml +++ b/main/res/xml/preferences.xml @@ -331,7 +331,7 @@ android:key="@string/pref_choose_list" android:title="@string/init_choose_list" android:summary="@string/init_summary_choose_list" - android:defaultValue="false" /> + android:defaultValue="true" /> </PreferenceScreen> diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java index 9e4251d..43afcb2 100644 --- a/main/src/cgeo/geocaching/settings/Settings.java +++ b/main/src/cgeo/geocaching/settings/Settings.java @@ -135,7 +135,7 @@ public final class Settings { e.putString(getKey(R.string.pref_memberstatus), old.getString(getKey(R.string.pref_memberstatus), "")); e.putInt(getKey(R.string.pref_coordinputformat), old.getInt(getKey(R.string.pref_coordinputformat), 0)); e.putBoolean(getKey(R.string.pref_log_offline), old.getBoolean(getKey(R.string.pref_log_offline), false)); - e.putBoolean(getKey(R.string.pref_choose_list), old.getBoolean(getKey(R.string.pref_choose_list), false)); + e.putBoolean(getKey(R.string.pref_choose_list), old.getBoolean(getKey(R.string.pref_choose_list), true)); e.putBoolean(getKey(R.string.pref_loaddirectionimg), old.getBoolean(getKey(R.string.pref_loaddirectionimg), true)); e.putString(getKey(R.string.pref_gccustomdate), old.getString(getKey(R.string.pref_gccustomdate), null)); e.putInt(getKey(R.string.pref_showwaypointsthreshold), old.getInt(getKey(R.string.pref_showwaypointsthreshold), SHOW_WP_THRESHOLD_DEFAULT)); @@ -560,7 +560,21 @@ public final class Settings { } public static boolean isUseImperialUnits() { - return getBoolean(R.string.pref_units, false); + return getBoolean(R.string.pref_units, getImperialUnitsDefault()); + } + + static boolean getImperialUnitsDefault() { + final String countryCode = Locale.getDefault().getCountry(); + if ("US".equals(countryCode)) { + return true; // USA + } + if ("LR".equals(countryCode)) { + return true; // Liberia + } + if ("MM".equals(countryCode)) { + return true; // Burma + } + return false; } public static boolean isLiveMap() { diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java index 479dd3c..c099f40 100644 --- a/main/src/cgeo/geocaching/settings/SettingsActivity.java +++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java @@ -134,6 +134,7 @@ public class SettingsActivity extends PreferenceActivity { R.string.pref_fakekey_preference_backup_info, }) { bindSummaryToStringValue(k); } + getPreference(R.string.pref_units).setDefaultValue(Settings.getImperialUnitsDefault()); } private void initNavigationMenuPreferences() { |