Update SettingsGeneralActivity.java

Reverted back the Unit changes so it will be possible to select it independendtly from Driving region:

https://code.google.com/p/osmand/issues/detail?id=2317
https://groups.google.com/forum/#!topic/osmand/9P6FclWSyw8
This commit is contained in:
Areg 2014-05-16 12:32:06 +01:00
parent 656939390d
commit 589eaf7ae2

View file

@ -138,16 +138,16 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
DrivingRegion[] drs = DrivingRegion.values(); DrivingRegion[] drs = DrivingRegion.values();
entries = new String[drs.length]; entries = new String[drs.length];
for (int i = 0; i < entries.length; i++) { for (int i = 0; i < entries.length; i++) {
entries[i] = getString(drs[i].name) + " (" + drs[i].defMetrics.toHumanString(this) +")" ; entries[i] = getString(drs[i].name); // + " (" + drs[i].defMetrics.toHumanString(this) +")" ;
} }
registerListPreference(settings.DRIVING_REGION, screen, entries, drs); registerListPreference(settings.DRIVING_REGION, screen, entries, drs);
// MetricsConstants[] mvls = MetricsConstants.values(); MetricsConstants[] mvls = MetricsConstants.values();
// entries = new String[mvls.length]; entries = new String[mvls.length];
// for(int i=0; i<entries.length; i++){ for(int i=0; i<entries.length; i++){
// entries[i] = mvls[i].toHumanString(getMyApplication()); entries[i] = mvls[i].toHumanString(getMyApplication());
// } }
// registerListPreference(settings.METRIC_SYSTEM, screen, entries, mvls); registerListPreference(settings.METRIC_SYSTEM, screen, entries, mvls);
String incompleteSuffix = " (" + getString(R.string.incomplete_locale) + ")"; String incompleteSuffix = " (" + getString(R.string.incomplete_locale) + ")";
//getResources().getAssets().getLocales(); //getResources().getAssets().getLocales();