diff options
Diffstat (limited to 'navit/android')
18 files changed, 13 insertions, 3 deletions
diff --git a/navit/android/AndroidManifest.xml b/navit/android/AndroidManifest.xml index 004ccb707..b9e646097 100644 --- a/navit/android/AndroidManifest.xml +++ b/navit/android/AndroidManifest.xml @@ -17,7 +17,7 @@ android:usesCleartextTraffic="true" android:allowBackup="true" android:fullBackupContent="@xml/navit_backup_rules" - android:icon="@drawable/icon" + android:icon="@mipmap/ic_launcher" android:name=".NavitAppConfig"> <activity android:name="Navit" android:label="@string/app_name" diff --git a/navit/android/res/drawable-hdpi/ic_launcher_background.png b/navit/android/res/drawable-hdpi/ic_launcher_background.png Binary files differnew file mode 100644 index 000000000..4d8e2e760 --- /dev/null +++ b/navit/android/res/drawable-hdpi/ic_launcher_background.png diff --git a/navit/android/res/drawable-hdpi/ic_launcher_foreground.png b/navit/android/res/drawable-hdpi/ic_launcher_foreground.png Binary files differnew file mode 100644 index 000000000..316279d11 --- /dev/null +++ b/navit/android/res/drawable-hdpi/ic_launcher_foreground.png diff --git a/navit/android/res/drawable-ldpi/ic_launcher_background.png b/navit/android/res/drawable-ldpi/ic_launcher_background.png Binary files differnew file mode 100644 index 000000000..8999f7aa1 --- /dev/null +++ b/navit/android/res/drawable-ldpi/ic_launcher_background.png diff --git a/navit/android/res/drawable-ldpi/ic_launcher_foreground.png b/navit/android/res/drawable-ldpi/ic_launcher_foreground.png Binary files differnew file mode 100644 index 000000000..e06e327bb --- /dev/null +++ b/navit/android/res/drawable-ldpi/ic_launcher_foreground.png diff --git a/navit/android/res/drawable-mdpi/ic_launcher_background.png b/navit/android/res/drawable-mdpi/ic_launcher_background.png Binary files differnew file mode 100644 index 000000000..f2e553f55 --- /dev/null +++ b/navit/android/res/drawable-mdpi/ic_launcher_background.png diff --git a/navit/android/res/drawable-mdpi/ic_launcher_foreground.png b/navit/android/res/drawable-mdpi/ic_launcher_foreground.png Binary files differnew file mode 100644 index 000000000..0196097fb --- /dev/null +++ b/navit/android/res/drawable-mdpi/ic_launcher_foreground.png diff --git a/navit/android/res/drawable-xhdpi/ic_launcher_background.png b/navit/android/res/drawable-xhdpi/ic_launcher_background.png Binary files differnew file mode 100644 index 000000000..58c6beb60 --- /dev/null +++ b/navit/android/res/drawable-xhdpi/ic_launcher_background.png diff --git a/navit/android/res/drawable-xhdpi/ic_launcher_foreground.png b/navit/android/res/drawable-xhdpi/ic_launcher_foreground.png Binary files differnew file mode 100644 index 000000000..70148579d --- /dev/null +++ b/navit/android/res/drawable-xhdpi/ic_launcher_foreground.png diff --git a/navit/android/res/drawable-xxhdpi/ic_launcher_background.png b/navit/android/res/drawable-xxhdpi/ic_launcher_background.png Binary files differnew file mode 100644 index 000000000..df2ea36fb --- /dev/null +++ b/navit/android/res/drawable-xxhdpi/ic_launcher_background.png diff --git a/navit/android/res/drawable-xxhdpi/ic_launcher_foreground.png b/navit/android/res/drawable-xxhdpi/ic_launcher_foreground.png Binary files differnew file mode 100644 index 000000000..ce3ccbc22 --- /dev/null +++ b/navit/android/res/drawable-xxhdpi/ic_launcher_foreground.png diff --git a/navit/android/res/mipmap-anydpi-v26/ic_launcher.xml b/navit/android/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..6b78462d6 --- /dev/null +++ b/navit/android/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@drawable/ic_launcher_background" /> + <foreground android:drawable="@drawable/ic_launcher_foreground" /> +</adaptive-icon> diff --git a/navit/android/res/mipmap-hdpi/ic_launcher.png b/navit/android/res/mipmap-hdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000..ce18b5780 --- /dev/null +++ b/navit/android/res/mipmap-hdpi/ic_launcher.png diff --git a/navit/android/res/mipmap-ldpi/ic_launcher.png b/navit/android/res/mipmap-ldpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000..183e2f829 --- /dev/null +++ b/navit/android/res/mipmap-ldpi/ic_launcher.png diff --git a/navit/android/res/mipmap-mdpi/ic_launcher.png b/navit/android/res/mipmap-mdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000..1bde1888e --- /dev/null +++ b/navit/android/res/mipmap-mdpi/ic_launcher.png diff --git a/navit/android/res/mipmap-xhdpi/ic_launcher.png b/navit/android/res/mipmap-xhdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000..041c61c03 --- /dev/null +++ b/navit/android/res/mipmap-xhdpi/ic_launcher.png diff --git a/navit/android/res/mipmap-xxhdpi/ic_launcher.png b/navit/android/res/mipmap-xxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000..ad89bd0b5 --- /dev/null +++ b/navit/android/res/mipmap-xxhdpi/ic_launcher.png diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index bacc15213..a9cad9be5 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -248,10 +248,15 @@ public class Navit extends Activity { private void verifyPermissions() { if (ContextCompat.checkSelfPermission(this, - Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { + Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) { + return; + } else if (ContextCompat.checkSelfPermission(this, + Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED) { + return; + } else { Log.d(TAG,"ask for permission(s)"); ActivityCompat.requestPermissions(this, new String[] { - Manifest.permission.ACCESS_FINE_LOCATION}, MY_PERMISSIONS_REQ_FINE_LOC); + Manifest.permission.ACCESS_BACKGROUND_LOCATION}, MY_PERMISSIONS_REQ_FINE_LOC); } } |
