kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Fixed bug with units being not applied.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-08-03 19:16:44 +03:00 • committed by Alex Zolotarev
parent e95a650f4c
commit 2ecb8efa5c
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
android/src/com/mapswithme/maps/settings/UnitLocale.java
View file

@ -4,18 +4,16 @@ import java.util.Locale;
public class UnitLocale
{
/// @note This constants should be equal with platform/settings.hpp
// This constants should be equal with platform/settings.hpp
public static final int UNITS_UNDEFINED = -1;
public static final int UNITS_METRIC = 0;
public static final int UNITS_YARD = 1;
public static final int UNITS_FOOT = 2;
public static final int UNITS_FOOT = 1;
private static int getDefaultUnits()
{
final String code = Locale.getDefault().getCountry();
// USA, UK, Liberia, Burma
String arr[] = { "US", "GB", "LR", "MM" };
String arr[] = {"US", "GB", "LR", "MM"};
for (String s : arr)
if (s.equalsIgnoreCase(code))
return UNITS_FOOT;
@ -40,14 +38,6 @@ public class UnitLocale
public static void initializeCurrentUnits()
{
final int u = getCurrentUnits();
if (u == UNITS_UNDEFINED)
{
// Checking system-default measurement system
setCurrentUnits(getDefaultUnits());
}
else
{
setCurrentUnits(u);
}
setCurrentUnits(u == UNITS_UNDEFINED ? getDefaultUnits() : u);
}
}