diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-09-22 17:34:05 -0700 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-09-22 17:34:05 -0700 |
commit | 3b90adaf353363e900a3afad0a97ab6d8fe57c3b (patch) | |
tree | a88d971c3318780977f043a978124f7fda61249a /app/src/google | |
parent | 3d400c3d64a79e98bec9b1d70554e636e6ae277e (diff) | |
download | etbsa-traccar-manager-android-3b90adaf353363e900a3afad0a97ab6d8fe57c3b.tar.gz etbsa-traccar-manager-android-3b90adaf353363e900a3afad0a97ab6d8fe57c3b.tar.bz2 etbsa-traccar-manager-android-3b90adaf353363e900a3afad0a97ab6d8fe57c3b.zip |
Target Android 10
Diffstat (limited to 'app/src/google')
3 files changed, 4 insertions, 3 deletions
diff --git a/app/src/google/AndroidManifest.xml b/app/src/google/AndroidManifest.xml index c0215a1..c9b855e 100644 --- a/app/src/google/AndroidManifest.xml +++ b/app/src/google/AndroidManifest.xml @@ -6,7 +6,8 @@ <application android:name=".GoogleMainApplication" - tools:replace="android:name"> + tools:replace="android:name" + tools:ignore="GoogleAppIndexingWarning"> <meta-data android:name="google_analytics_adid_collection_enabled" diff --git a/app/src/google/java/org/traccar/manager/GoogleMainApplication.java b/app/src/google/java/org/traccar/manager/GoogleMainApplication.java index 47756aa..fe0c65f 100644 --- a/app/src/google/java/org/traccar/manager/GoogleMainApplication.java +++ b/app/src/google/java/org/traccar/manager/GoogleMainApplication.java @@ -23,7 +23,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Build; -import android.support.v4.content.LocalBroadcastManager; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.google.android.gms.tasks.OnSuccessListener; import com.google.firebase.analytics.FirebaseAnalytics; diff --git a/app/src/google/java/org/traccar/manager/ManagerMessagingService.java b/app/src/google/java/org/traccar/manager/ManagerMessagingService.java index 55a3b06..7548ce5 100644 --- a/app/src/google/java/org/traccar/manager/ManagerMessagingService.java +++ b/app/src/google/java/org/traccar/manager/ManagerMessagingService.java @@ -18,7 +18,7 @@ package org.traccar.manager; import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Intent; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; |