closes #418

android/jni/com/mapswithme/maps/Framework.cpp

@@ -284,4 +284,9 @@ namespace android
   {
     m_work.Invalidate();
   }
+
+  void Framework::SetupMeasurementSystem()
+  {
+    m_work.SetupMeasurementSystem();
+  }
 }

android/jni/com/mapswithme/maps/Framework.hpp

@@ -60,6 +60,8 @@ namespace android
 
     void LoadState();
     void SaveState();
+
+    void SetupMeasurementSystem();
   };
 }
 

android/jni/com/mapswithme/maps/MWMActivity.cpp

@@ -15,6 +15,7 @@
 
 #include "Framework.hpp"
 #include "../platform/Platform.hpp"
+#include "../../../../../platform/settings.hpp"
 #include "../../../nv_event/nv_event.hpp"
 #include "../jni/jni_thread.hpp"
 
@@ -73,4 +74,33 @@ extern "C"
   {
     g_framework->OnCompassUpdated(time, magneticNorth, trueNorth, accuracy);
   }
+
+  JNIEXPORT jboolean JNICALL
+  Java_com_mapswithme_maps_MWMActivity_hasMeasurementSystem(JNIEnv * env, jobject thiz)
+  {
+    Settings::Units u;
+    return Settings::Get("Units", u);
+  }
+
+  JNIEXPORT void JNICALL
+  Java_com_mapswithme_maps_MWMActivity_setMeasurementSystem(JNIEnv * env, jobject thiz, jint systemIdx)
+  {
+    Settings::Units u = (Settings::Units)systemIdx;
+    Settings::Set("Units", u);
+  }
+
+  JNIEXPORT void JNICALL
+  Java_com_mapswithme_maps_MWMActivity_setupMeasurementSystem(JNIEnv * env, jobject thiz)
+  {
+    g_framework->SetupMeasurementSystem();
+  }
+
+  JNIEXPORT jint JNICALL
+  Java_com_mapswithme_maps_MWMActivity_getMeasurementSystem(JNIEnv * env, jobject thiz)
+  {
+    Settings::Units u = Settings::Metric;
+    Settings::Get("Units", u);
+    return u;
+  }
+
 } // extern "C"

android/src/com/mapswithme/maps/MWMActivity.java

@@ -6,6 +6,8 @@ import com.mapswithme.maps.R;
 import com.mapswithme.maps.location.LocationService;
 import com.nvidia.devtech.NvEventQueueActivity;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -41,6 +43,64 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService
     String storagePath = Environment.getExternalStorageDirectory().getAbsolutePath();
     return storagePath.concat(String.format("/%s/", PACKAGE_NAME));
   }
+
+  private void checkMeasurementSystem()
+  {
+    int u;
+    if (!hasMeasurementSystem())
+    {
+      /// checking system-default measurement system
+      
+      if (UnitLocale.getCurrent() == UnitLocale.Metric)
+      {
+        u = UNITS_METRIC;
+        setupMeasurementSystem();
+      }
+      else
+      {
+        u = UNITS_FOOT;
+
+        /// showing "select measurement system" dialog.
+        AlertDialog alert = new AlertDialog.Builder(this).create();  
+        alert.setCancelable(false); 
+
+        alert.setMessage("Which measurement system do you prefer?");
+      
+        alert.setButton(AlertDialog.BUTTON_NEGATIVE, "Mi", new DialogInterface.OnClickListener(){
+          public void onClick(DialogInterface dialog, int which){
+            setMeasurementSystem(UNITS_FOOT);
+            setupMeasurementSystem();
+            dialog.dismiss();
+            }
+          });
+      
+        alert.setButton(AlertDialog.BUTTON_POSITIVE, "Km", new DialogInterface.OnClickListener(){
+          public void onClick(DialogInterface dlg, int which){
+            setMeasurementSystem(UNITS_METRIC);
+            setupMeasurementSystem();
+            dlg.dismiss();
+            }
+          });
+      
+        alert.show();
+      }
+      
+      setMeasurementSystem(u);
+    }
+    else
+      setupMeasurementSystem();
+  }
+  
+  private native boolean hasMeasurementSystem();
+
+  
+  private final int UNITS_METRIC = 0;
+  private final int UNITS_YARD = 1;
+  private final int UNITS_FOOT = 2;
+
+  private native int getMeasurementSystem();    
+  private native void setMeasurementSystem(int u);
+  private native void setupMeasurementSystem();
   
   @Override
   public void onCreate(Bundle savedInstanceState)
@@ -61,11 +121,14 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService
       e.printStackTrace();
     }
 
+    checkMeasurementSystem();
+    
     m_timer = new VideoTimer();
     m_locationIconRes = R.drawable.ic_menu_location;
     m_locationService = new LocationService(this);
   }
   
+  
   public void onLocationStatusChanged(int newStatus)
   {
     switch (newStatus)

map/information_display.cpp

@@ -95,7 +95,12 @@ void InformationDisplay::drawRuler(DrawerYG * pDrawer)
   m_ruler.setFontDesc(rulerFont);
   m_ruler.setVisualScale(m_visualScale);
 
-#ifdef OMIM_OS_IPHONE
+#if defined(OMIM_OS_IPHONE)
+  m2::PointD pivot(m2::PointD(m_displayRect.maxX(),
+                              m_displayRect.maxY() - 20 * m_visualScale)
+                 + m2::PointD(-10 * m_visualScale, - 10 * m_visualScale));
+  m_ruler.setPosition(yg::EPosAboveLeft);
+#elif defined(OMIM_OS_ANDROID)
   m2::PointD pivot(m2::PointD(m_displayRect.maxX(),
                               m_displayRect.maxY() - 20 * m_visualScale)
                  + m2::PointD(-10 * m_visualScale, - 10 * m_visualScale));
@@ -145,7 +150,11 @@ void InformationDisplay::drawCenter(DrawerYG * drawer)
   params.m_fontDesc.m_color = yg::Color(0x44, 0x44, 0x44, 0xD9);
   params.m_log2vis = false;
 
-#ifdef OMIM_OS_IPHONE
+#if defined(OMIM_OS_IPHONE)
+  params.m_pivot = m2::PointD(m_displayRect.maxX() - 10 * m_visualScale,
+                              m_displayRect.maxY() - 10 * m_visualScale);
+  params.m_position = yg::EPosAboveLeft;
+#elif defined(OMIM_OS_ANDROID)
   params.m_pivot = m2::PointD(m_displayRect.maxX() - 10 * m_visualScale,
                               m_displayRect.maxY() - 10 * m_visualScale);
   params.m_position = yg::EPosAboveLeft;

platform/settings.hpp

@@ -39,5 +39,5 @@ namespace Settings
     StringStorage::Instance().SetValue(key, ToString(value));
   }
 
-  enum Units { Metric, Yard, Foot };
+  enum Units { Metric = 0, Yard, Foot };
 }