diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 80240fef03..eac4576e55 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -7,9 +7,6 @@ android:sharedUserId="com.mapswithme" android:sharedUserLabel="@string/shared_user_label"> - - @@ -274,7 +271,7 @@ android:exported="false"> - + diff --git a/android/build.gradle b/android/build.gradle index a475139316..afacfee974 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -20,7 +20,6 @@ dependencies { // android support libs compile 'com.android.support:support-v4:22.2.1' compile 'com.android.support:appcompat-v7:22.2.1' - compile 'com.android.support:cardview-v7:22.2.1' compile 'com.android.support:recyclerview-v7:22.2.1' compile 'com.android.support:design:22.2.1' // google play services @@ -32,7 +31,7 @@ dependencies { compile 'com.facebook.android:facebook-android-sdk:4.2.0' // for Parse SDK compile 'com.parse.bolts:bolts-android:1.+' - compile fileTree(dir: '3rd_party', include: '*.jar', exclude: 'mrgsmanifest.jar') + compile fileTree(dir: '3rd_party', include: '*.jar') // BottomSheet compile project(":3rd_party:BottomSheet") } @@ -62,7 +61,7 @@ android { res.srcDirs = ['res'] java.srcDirs = ['src', '../3party/Alohalytics/src/android/java'] // assets folder is auto-generated by tools/android/update_assets.sh, so we keep all static resources in separate folders. - assets.srcDirs = ['assets', 'assets-mrgs'] + assets.srcDirs = ['assets'] jniLibs.srcDirs = ['libs'] } diff --git a/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java b/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java index a7e151a637..f941e5b7d4 100644 --- a/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java +++ b/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java @@ -10,7 +10,7 @@ import com.mapswithme.util.statistics.AlohaHelper; import ru.mail.android.mytracker.campaign.CampaignReceiver; /** - * Custom broadcast receiver to send intent to MRGS & Alohalytics at the same time + * Custom broadcast receiver to send intent to MyTracker & Alohalytics at the same time */ public class MultipleTrackerReferrerReceiver extends BroadcastReceiver {