[android] Added dpi-dependent skin support

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

@@ -36,12 +36,12 @@ extern "C"
   }
 
   JNIEXPORT void JNICALL
-  Java_com_mapswithme_maps_MWMActivity_nativeInit(JNIEnv * env, jobject thiz,
+  Java_com_mapswithme_maps_MWMActivity_nativeInit(JNIEnv * env, jobject thiz, int densityDpi,
       jstring apkPath, jstring storagePath, jstring tmpPath, jstring extTmpPath, jstring settingsPath)
   {
     if (!g_framework)
     {
-      android::Platform::Instance().Initialize(env, apkPath, storagePath,
+      android::Platform::Instance().Initialize(env, densityDpi, apkPath, storagePath,
           tmpPath, extTmpPath, settingsPath);
       g_framework = new android::Framework(g_jvm);
     }

android/jni/com/mapswithme/platform/Platform.cpp

@@ -4,11 +4,45 @@
 
 #include "../../../../../base/logging.hpp"
 
+class Platform::PlatformImpl
+{
+public:
+  PlatformImpl(int densityDpi)
+  { // Constants are taken from android.util.DisplayMetrics
+    switch (densityDpi)
+    {
+    case 120: m_visualScale = 0.75; m_skinName = "basic_ldpi.skn"; break;
+    case 160: m_visualScale = 1.0; m_skinName = "basic_mdpi.skn"; break;
+    case 240: m_visualScale = 1.5; m_skinName = "basic_hdpi.skn"; break;
+    default: m_visualScale = 2.0; m_skinName = "basic_xhdpi.skn"; break;
+    }
+  }
+  double m_visualScale;
+  string m_skinName;
+};
+
+double Platform::VisualScale() const
+{
+  return m_impl->m_visualScale;
+}
+
+string Platform::SkinName() const
+{
+  return m_impl->m_skinName;
+}
+
 namespace android
 {
-  void Platform::Initialize(JNIEnv * env, jstring apkPath, jstring storagePath,
+  Platform::~Platform()
+  {
+    delete m_impl;
+  }
+
+  void Platform::Initialize(JNIEnv * env, jint densityDpi, jstring apkPath, jstring storagePath,
       jstring tmpPath, jstring extTmpPath, jstring settingsPath)
   {
+    m_impl = new PlatformImpl(densityDpi);
+
     m_resourcesDir = jni::ToString(env, apkPath);
     m_writableDir = jni::ToString(env, storagePath);
     m_settingsDir = jni::ToString(env, settingsPath);

android/jni/com/mapswithme/platform/Platform.hpp

@@ -14,7 +14,8 @@ namespace android
     string m_localTmpPath;
 
   public:
-    void Initialize(JNIEnv * env, jstring apkPath, jstring storagePath,
+    ~Platform();
+    void Initialize(JNIEnv * env, jint densityDpi, jstring apkPath, jstring storagePath,
         jstring tmpPath, jstring extTmpPath, jstring settingsPath);
 
     void OnExternalStorageStatusChanged(bool isAvailable);

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

@@ -21,6 +21,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.webkit.WebView;
+import android.util.DisplayMetrics;
 import android.util.Log;
 
 public class MWMActivity extends NvEventQueueActivity implements
@@ -163,11 +164,15 @@ public class MWMActivity extends NvEventQueueActivity implements
 
     final String extStoragePath = getDataStoragePath("files");
     final String extTmpPath = getDataStoragePath("caches");
-    // create folders if they don't exist
+    // Create folders if they don't exist
     new File(extStoragePath).mkdirs();
     new File(extTmpPath).mkdirs();
 
-    nativeInit(getAppBundlePath(), extStoragePath, getTmpPath(), extTmpPath, getSettingsPath());
+    // Get screen density
+    DisplayMetrics metrics = new DisplayMetrics();
+    getWindowManager().getDefaultDisplay().getMetrics(metrics);
+    
+    nativeInit(metrics.densityDpi, getAppBundlePath(), extStoragePath, getTmpPath(), extTmpPath, getSettingsPath());
 
     setupLanguages();
 
@@ -362,7 +367,7 @@ public class MWMActivity extends NvEventQueueActivity implements
   private native void nativeStorageConnected();
   private native void nativeStorageDisconnected();
 
-  private native void nativeInit(String apkPath, String storagePath,
+  private native void nativeInit(int densityDpi, String apkPath, String storagePath,
       String tmpPath, String extTmpPath, String settingsPath);
   private native void nativeLocationStatusChanged(int newStatus);
   private native void nativeLocationUpdated(long time, double lat, double lon, float accuracy);

platform/platform_android.cpp

@@ -96,16 +96,6 @@ string Platform::DeviceName() const
   return "Android";
 }
 
-double Platform::VisualScale() const
-{
-  return 1.5;
-}
-
-string Platform::SkinName() const
-{
-  return "basic_mdpi.skn";
-}
-
 void Platform::GetFontNames(FilesList & res) const
 {
   GetFilesInDir(ResourcesDir(), "*.ttf", res);