diff options
author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-10-16 14:14:31 +0300 |
---|---|---|
committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-11-30 16:19:15 +0300 |
commit | d16271378329caaa4321b33ecb1e26988daa4889 (patch) | |
tree | 8a250eae14dbd4b9239a580e1f84ea98ad47b18c /android | |
parent | e345cdfb8df864afd3e32c6fabba5f5bccc85a61 (diff) |
Fixes after rebase
Diffstat (limited to 'android')
-rw-r--r-- | android/jni/com/mapswithme/maps/Framework.cpp | 5 | ||||
-rw-r--r-- | android/jni/com/mapswithme/maps/Framework.hpp | 2 | ||||
-rw-r--r-- | android/jni/com/mapswithme/maps/settings/UnitLocale.cpp | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 3ca9a42cdb..5f55e15191 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -477,6 +477,11 @@ void Framework::ApplyWidgets() m_work.SetWidgetLayout(move(layout)); } +void Framework::SetupMeasurementSystem() +{ + m_work.SetupMeasurementSystem(); +} + ////////////////////////////////////////////////////////////////////////////////////////// void Framework::ItemStatusChanged(int childPosition) { diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp index 4c75e71b62..932ab26856 100644 --- a/android/jni/com/mapswithme/maps/Framework.hpp +++ b/android/jni/com/mapswithme/maps/Framework.hpp @@ -83,6 +83,8 @@ namespace android void SetMapStyle(MapStyle mapStyle); MapStyle GetMapStyle() const; + void SetupMeasurementSystem(); + void SetRouter(routing::RouterType type) { m_work.SetRouter(type); } routing::RouterType GetRouter() const { return m_work.GetRouter(); } routing::RouterType GetLastUsedRouter() const { return m_work.GetLastUsedRouter(); } diff --git a/android/jni/com/mapswithme/maps/settings/UnitLocale.cpp b/android/jni/com/mapswithme/maps/settings/UnitLocale.cpp index de718d8bf5..b44de3438f 100644 --- a/android/jni/com/mapswithme/maps/settings/UnitLocale.cpp +++ b/android/jni/com/mapswithme/maps/settings/UnitLocale.cpp @@ -10,6 +10,7 @@ extern "C" { Settings::Units const u = static_cast<Settings::Units>(units); Settings::Set("Units", u); + g_framework->SetupMeasurementSystem(); } JNIEXPORT jint JNICALL |