Add:Core:Android updates

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2482 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 7 insertions, 3 deletions

diff --git a/navit/graphics/android/graphics_android.c b/navit/graphics/android/graphics_android.c
index 34fa6006b..3c39e054b 100644
--- a/navit/graphics/android/graphics_android.c
+++ b/navit/graphics/android/graphics_android.c
@@ -289,7 +289,7 @@ draw_text(struct graphics_priv *gra, struct graphics_gc_priv *fg, struct graphic
 {
 	dbg(1,"enter %s\n", text);
 	jstring string = (*jnienv)->NewStringUTF(jnienv, text);
-	(*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_text, fg->Paint, p->x, p->y, string);
+	(*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_text, fg->Paint, p->x, p->y, string, font->size, dx, dy);
 	(*jnienv)->DeleteLocalRef(jnienv, string);
 }
 
@@ -548,7 +548,7 @@ graphics_android_init(struct graphics_priv *ret, struct graphics_priv *parent, s
 		return 0;
 	if (!find_method(ret->NavitGraphicsClass, "draw_circle", "(Landroid/graphics/Paint;III)V", &ret->NavitGraphics_draw_circle))
 		return 0;
-	if (!find_method(ret->NavitGraphicsClass, "draw_text", "(Landroid/graphics/Paint;IILjava/lang/String;)V", &ret->NavitGraphics_draw_text))
+	if (!find_method(ret->NavitGraphicsClass, "draw_text", "(Landroid/graphics/Paint;IILjava/lang/String;III)V", &ret->NavitGraphics_draw_text))
 		return 0;
 	if (!find_method(ret->NavitGraphicsClass, "draw_image", "(Landroid/graphics/Paint;IILandroid/graphics/Bitmap;)V", &ret->NavitGraphics_draw_image))
 		return 0;
@@ -573,7 +573,7 @@ graphics_android_fullscreen(struct window *win, int on)
 }
 
 static jclass NavitClass;
-static jmethodID Navit_disableSuspend;
+static jmethodID Navit_disableSuspend, Navit_exit;
 
 static void
 graphics_android_disable_suspend(struct window *win)
@@ -630,6 +630,7 @@ event_android_main_loop_run(void)
 static void event_android_main_loop_quit(void)
 {
         dbg(0,"enter\n");
+	(*jnienv)->CallVoidMethod(jnienv, android_activity, Navit_exit);
 }
 
 
@@ -774,6 +775,9 @@ event_android_new(struct event_methods *meth)
 	Navit_disableSuspend = (*jnienv)->GetMethodID(jnienv, NavitClass, "disableSuspend", "()V");
 	if (Navit_disableSuspend == NULL) 
 		return NULL;
+	Navit_exit = (*jnienv)->GetMethodID(jnienv, NavitClass, "exit", "()V");
+	if (Navit_exit == NULL) 
+		return NULL;
 	dbg(0,"ok\n");
         *meth=event_android_methods;
         return NULL;