diff --git a/api/android/lib/res/drawable/background_pattern.xml b/api/android/lib/res/drawable/background_pattern.xml
index 88af2b7dd1..2293a5123b 100644
--- a/api/android/lib/res/drawable/background_pattern.xml
+++ b/api/android/lib/res/drawable/background_pattern.xml
@@ -1,5 +1,5 @@
+ android:tileMode="repeat" />
diff --git a/api/android/lib/res/drawable/btn_back_gray.xml b/api/android/lib/res/drawable/btn_back_gray.xml
new file mode 100644
index 0000000000..605891ffc5
--- /dev/null
+++ b/api/android/lib/res/drawable/btn_back_gray.xml
@@ -0,0 +1,29 @@
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_back_gray_active.xml b/api/android/lib/res/drawable/btn_back_gray_active.xml
new file mode 100644
index 0000000000..17460d286c
--- /dev/null
+++ b/api/android/lib/res/drawable/btn_back_gray_active.xml
@@ -0,0 +1,40 @@
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_back_green.xml b/api/android/lib/res/drawable/btn_back_green.xml
new file mode 100644
index 0000000000..88ea2992e6
--- /dev/null
+++ b/api/android/lib/res/drawable/btn_back_green.xml
@@ -0,0 +1,29 @@
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_back_green_active.xml b/api/android/lib/res/drawable/btn_back_green_active.xml
new file mode 100644
index 0000000000..260760fa29
--- /dev/null
+++ b/api/android/lib/res/drawable/btn_back_green_active.xml
@@ -0,0 +1,35 @@
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_gray_selector.xml b/api/android/lib/res/drawable/btn_gray_selector.xml
new file mode 100644
index 0000000000..3876bb0761
--- /dev/null
+++ b/api/android/lib/res/drawable/btn_gray_selector.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_green_selector.xml b/api/android/lib/res/drawable/btn_green_selector.xml
new file mode 100644
index 0000000000..61b78df322
--- /dev/null
+++ b/api/android/lib/res/drawable/btn_green_selector.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/api/android/lib/res/layout/dlg_install_mwm.xml b/api/android/lib/res/layout/dlg_install_mwm.xml
index f1e569ec27..e2c71cca71 100644
--- a/api/android/lib/res/layout/dlg_install_mwm.xml
+++ b/api/android/lib/res/layout/dlg_install_mwm.xml
@@ -27,50 +27,47 @@
android:layout_height="match_parent" >
+ android:paddingLeft="10dp"
+ android:paddingRight="10dp" >
+ android:text="@string/mwm_should_be_installed"
+ android:textColor="@android:color/black"/>
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/api/android/lib/res/values/strings.xml b/api/android/lib/res/values/strings.xml
index d3981d2203..b8f51e508a 100644
--- a/api/android/lib/res/values/strings.xml
+++ b/api/android/lib/res/values/strings.xml
@@ -1,7 +1,9 @@
- http://www.mapswithme.com/get/
- MapsWithMe
- We have partnered with MapsWithMe to provide you with offline maps of the entire world.
- To continue please\ndownload the app
-
+ MapsWithMe app should be installed to view the map.
+ Download MapsWithMe Lite (free)
+ Download MapsWithMe Pro
+
+ http://mapswith.me/download
+ http://mapswith.me/download?lite
+
\ No newline at end of file
diff --git a/api/android/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java b/api/android/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java
index 2fe80bf7d7..ae9570f1be 100644
--- a/api/android/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java
+++ b/api/android/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java
@@ -22,30 +22,35 @@
******************************************************************************/
package com.mapswithme.maps.api;
+import android.app.Activity;
import android.app.Dialog;
-import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.view.View;
+import android.view.Window;
import com.mapwithme.maps.api.R;
public class DownloadMapsWithMeDialog extends Dialog implements android.view.View.OnClickListener
{
- public DownloadMapsWithMeDialog(Context context)
+ public DownloadMapsWithMeDialog(Activity activity)
{
- super(context);
+ super(activity);
- setTitle(R.string.mapswithme);
+ requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.dlg_install_mwm);
- findViewById(R.id.download).setOnClickListener(this);
+
+ findViewById(R.id.btn_lite).setOnClickListener(this);
+ findViewById(R.id.btn_pro).setOnClickListener(this);
+
+ setOwnerActivity(activity);
}
- public void onDownloadButtonClicked()
+ public void onDownloadButtonClicked(String url)
{
- Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(getContext().getString(R.string.downolad_url)));
+ Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
getContext().startActivity(i);
dismiss();
}
@@ -54,7 +59,9 @@ public class DownloadMapsWithMeDialog extends Dialog implements android.view.Vie
@Override
public void onClick(View v)
{
- if (v.getId() == R.id.download)
- onDownloadButtonClicked();
+ String url = getContext().getString(R.string.url_lite);
+ if (v.getId() == R.id.btn_pro) url = getContext().getString(R.string.url_pro);
+
+ onDownloadButtonClicked(url);
}
}