diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index d397d503c7..8c2135517e 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -235,6 +235,10 @@
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize"
android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+
+
NewStringUTF(ALOHALYTICS_URL);
}
JNIEXPORT jstring JNICALL
- Java_com_mapswithme_maps_PrivateVariables_flurryKey(JNIEnv * env, jclass)
+ Java_com_mapswithme_maps_PrivateVariables_flurryKey(JNIEnv * env, jclass clazz)
{
return env->NewStringUTF(FLURRY_KEY);
}
JNIEXPORT jstring JNICALL
- Java_com_mapswithme_maps_PrivateVariables_myTrackerKey(JNIEnv * env, jclass)
+ Java_com_mapswithme_maps_PrivateVariables_myTrackerKey(JNIEnv * env, jclass clazz)
{
return env->NewStringUTF(MY_TRACKER_KEY);
}
JNIEXPORT jstring JNICALL
- Java_com_mapswithme_maps_PrivateVariables_parseApplicationId(JNIEnv * env, jclass)
+ Java_com_mapswithme_maps_PrivateVariables_parseApplicationId(JNIEnv * env, jclass clazz)
{
return env->NewStringUTF(PARSE_APPLICATION_ID);
}
JNIEXPORT jstring JNICALL
- Java_com_mapswithme_maps_PrivateVariables_parseClientKey(JNIEnv * env, jclass)
+ Java_com_mapswithme_maps_PrivateVariables_parseClientKey(JNIEnv * env, jclass clazz)
{
return env->NewStringUTF(PARSE_CLIENT_KEY);
}
+
+ JNIEXPORT jstring JNICALL
+ Java_com_mapswithme_maps_PrivateVariables_myTargetSlot(JNIEnv * env, jclass clazz)
+ {
+ return env->NewStringUTF(MY_TARGET_KEY);
+ }
+
+ JNIEXPORT jstring JNICALL
+ Java_com_mapswithme_maps_PrivateVariables_myTargetCheckUrl(JNIEnv * env, jclass clazz)
+ {
+ return env->NewStringUTF(AD_PERMISION_SERVER_URL);
+ }
+
+ JNIEXPORT jlong JNICALL
+ Java_com_mapswithme_maps_PrivateVariables_myTargetCheckInterval(JNIEnv * env, jclass clazz)
+ {
+ return static_cast(AD_PERMISION_CHECK_DURATION);
+ }
}
diff --git a/android/proguard-mwm.txt b/android/proguard-mwm.txt
index 748912144d..3e30d1150a 100644
--- a/android/proguard-mwm.txt
+++ b/android/proguard-mwm.txt
@@ -1,30 +1,24 @@
# obfuscate supportV7 menu subclasses. it fixes bug with some Samsung and other devices ROMS based on android 4.2.2.
# more details here : https://code.google.com/p/android/issues/detail?id=78377
-keep class !android.support.v7.internal.view.menu.**,** {*;}
+# support library bug
+-dontwarn android.support.**
# flurry
-dontwarn com.flurry.**
-# support library bug
--dontwarn android.support.**
-
# parse
-dontwarn com.squareup.okhttp.**
-dontwarn okio.**
-dontwarn com.facebook.**
+# myTarget
+-dontwarn ru.mail.android.mytarget.**
+-dontwarn com.mopub.**
+
-dontoptimize
-keepattributes **
-# log proguard info
-#
-#-verbose
-#
-#-printseeds seeds.txt
-#-printusage unused.txt
-#-printmapping mapping.txt
-
-
# Gson support
-keep class com.mapswithme.util.Gsonable
-keep class * implements com.mapswithme.util.Gsonable
diff --git a/android/res/drawable-hdpi/ic_showcase.png b/android/res/drawable-hdpi/ic_showcase.png
new file mode 100644
index 0000000000..6aa0b6a439
Binary files /dev/null and b/android/res/drawable-hdpi/ic_showcase.png differ
diff --git a/android/res/drawable-mdpi/ic_showcase.png b/android/res/drawable-mdpi/ic_showcase.png
new file mode 100644
index 0000000000..56ed85b334
Binary files /dev/null and b/android/res/drawable-mdpi/ic_showcase.png differ
diff --git a/android/res/drawable-xhdpi/ic_showcase.png b/android/res/drawable-xhdpi/ic_showcase.png
new file mode 100644
index 0000000000..4af03e3243
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_showcase.png differ
diff --git a/android/res/drawable-xxhdpi/ic_showcase.png b/android/res/drawable-xxhdpi/ic_showcase.png
new file mode 100644
index 0000000000..2335637ce5
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_showcase.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_showcase.png b/android/res/drawable-xxxhdpi/ic_showcase.png
new file mode 100644
index 0000000000..85f5bd0860
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_showcase.png differ
diff --git a/android/res/layout-land/menu_content.xml b/android/res/layout-land/menu_content.xml
deleted file mode 100644
index 4092dfcd2b..0000000000
--- a/android/res/layout-land/menu_content.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/android/res/layout/menu_content.xml b/android/res/layout/menu_content.xml
index 57eb71f14f..cf40f31918 100644
--- a/android/res/layout/menu_content.xml
+++ b/android/res/layout/menu_content.xml
@@ -1,49 +1,65 @@
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
+
+
\ No newline at end of file
diff --git a/android/res/layout/menu_content_grid.xml b/android/res/layout/menu_content_grid.xml
index 3d60a64b21..a43ccdc2ba 100644
--- a/android/res/layout/menu_content_grid.xml
+++ b/android/res/layout/menu_content_grid.xml
@@ -1,51 +1,67 @@
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
+
+
\ No newline at end of file
diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml
index 397009c077..4f98701e31 100644
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@@ -40,6 +40,7 @@
MapStyle
TtsEnabled
TtsLanguage
+ DisplayShowcase
%1$s: %2$s
%2$s :%1$s
diff --git a/android/res/xml-v21/prefs_misc.xml b/android/res/xml-v21/prefs_misc.xml
index 97cf77367c..09754335cc 100644
--- a/android/res/xml-v21/prefs_misc.xml
+++ b/android/res/xml-v21/prefs_misc.xml
@@ -1,18 +1,25 @@
+
+
+ android:switchTextOff=""
+ android:switchTextOn=""/>
+ android:switchTextOff=""
+ android:switchTextOn=""/>
\ No newline at end of file
diff --git a/android/res/xml/prefs_misc.xml b/android/res/xml/prefs_misc.xml
index 257411bc42..9298dd176d 100644
--- a/android/res/xml/prefs_misc.xml
+++ b/android/res/xml/prefs_misc.xml
@@ -1,6 +1,11 @@
+
+