diff options
| author | jandegr <jandegr@users.noreply.github.com> | 2017-01-25 20:50:40 +0100 |
|---|---|---|
| committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2017-01-25 11:50:40 -0800 |
| commit | 5ae7e6379326588f98cfd8a774aa0caec286646d (patch) | |
| tree | fca46b6ccdfff5689a1fb2900a3a44cf98b5fc69 | |
| parent | 94a3c994a7a5970be3b3bb9d290f9e1d8d437034 (diff) | |
| download | navit-5ae7e6379326588f98cfd8a774aa0caec286646d.tar.gz | |
Jandegr patch 1 (#203)R7263
* ndk downgrade
ndk downgrade
* ndk downgrade
* Update build_android.sh
* Update build_android_x86.sh
* Update build_android.sh
* Update build_android_x86.sh
* Update build_android_x86.sh
* Update build_android.sh
* Update NavitAppConfig.java
* Add files via upload
* Delete acra-4.3.0b2.jar
* Update NavitAppConfig.java
* Update Navit.java
* Update AndroidManifest.xml.cmake
* Update Navit.java
* Update Navit.java
| -rw-r--r-- | navit/android/AndroidManifest.xml.cmake | 10 | ||||
| -rw-r--r-- | navit/android/src/org/navitproject/navit/Navit.java | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/navit/android/AndroidManifest.xml.cmake b/navit/android/AndroidManifest.xml.cmake index b5bd757cb..7aa882bb8 100644 --- a/navit/android/AndroidManifest.xml.cmake +++ b/navit/android/AndroidManifest.xml.cmake @@ -37,5 +37,15 @@ <activity android:name=".NavitDownloadSelectMapActivity"></activity> <activity android:name=".NavitAddressResultListActivity"></activity> <activity android:name=".FileBrowserActivity"></activity> + <activity + android:name="org.acra.dialog.CrashReportDialog" + android:theme="@android:style/Theme.Dialog" + android:launchMode="singleInstance" + android:excludeFromRecents="true" + android:finishOnTaskLaunch="true"/> + <service + android:name="org.acra.sender.SenderService" + android:exported="false" + android:process=":acra" /> </application> </manifest> diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index c8578df07..11a1919b7 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -303,8 +303,8 @@ public class Navit extends Activity PendingIntent appIntent = PendingIntent.getActivity(getApplicationContext(), 0, getIntent(), 0);
// FIXME : needs a fix for sdk 23
// NavitNotification.setLatestEventInfo(getApplicationContext(), "Navit", getString(R.string.notification_event_default), appIntent); // Set the text in the notification
- NavitNotification.flags|=Notification.FLAG_ONGOING_EVENT; // Ensure that the notification appears in Ongoing
- nm.notify(R.string.app_name, NavitNotification); // Set the notification
+// NavitNotification.flags|=Notification.FLAG_ONGOING_EVENT; // Ensure that the notification appears in Ongoing
+// nm.notify(R.string.app_name, NavitNotification); // Set the notification
// Status and navigation bar sizes
// These are platform defaults and do not change with rotation, but we have to figure out which ones apply
@@ -864,8 +864,8 @@ public class Navit extends Activity public void exit()
{
- NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
- nm.cancel(R.string.app_name);
+// NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+// nm.cancel(R.string.app_name);
NavitVehicle.removeListener();
NavitDestroy();
}
|