Fix:android:Use maps tag instead of adding maps from android code to make resume...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5156 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/android/src/org/navitproject/navit/Navit.java b/navit/navit/android/src/org/navitproject/navit/Navit.java
index 7f5276c..6597364 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/navit/android/src/org/navitproject/navit/Navit.java
@@ -306,25 +306,11 @@ public class Navit extends Activity
                Log.e("Navit", "android.os.Build.VERSION.SDK_INT=" + Integer.valueOf(android.os.Build.VERSION.SDK));\r
                NavitMain(this, NavitLanguage, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density, NAVIT_DATA_DIR+"/bin/navit");\r
 \r
-               activateAllMaps();\r
-\r
                showInfos();\r
 \r
                Navit.mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);\r
        }\r
 \r
-       private void activateAllMaps()\r
-       {\r
-               NavitMap maps[] = NavitMapDownloader.getAvailableMaps();\r
-               for (NavitMap map : maps) {\r
-                       Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_LOAD_MAP.ordinal());\r
-                       Bundle b = new Bundle();\r
-                       b.putString("title", map.getLocation());\r
-                       msg.setData(b);\r
-                       msg.sendToTarget();\r
-               }\r
-       }\r
-\r
        @Override\r
        public void onResume()\r
        {\r

diff --git a/navit/navit/xslt/map_sdcard_navitmap_bin.xslt b/navit/navit/xslt/map_sdcard_navitmap_bin.xslt
index fda6279..d9a9cde 100644 (file)
--- a/navit/navit/xslt/map_sdcard_navitmap_bin.xslt
+++ b/navit/navit/xslt/map_sdcard_navitmap_bin.xslt
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xi="http://www.w3.org/2001/XInclude">
        <xsl:template match="/config/navit/mapset/xi:include">
+               <maps type="binfile" data="/sdcard/navit/*.bin" />
        </xsl:template>
 </xsl:transform>