6 files changed, 10 insertions, 5 deletions
diff --git a/navit/navit/Makefile.am b/navit/navit/Makefile.am
index e04adbeb7..0ee09ae1c 100644
--- a/navit/navit/Makefile.am
+++ b/navit/navit/Makefile.am
@@ -73,8 +73,11 @@ if SUPPORT_ANDROID
 #	new android xml files for (mdpi,ldpi,hdpi)
 	cp $(srcdir)/navit_shipped.xml navit_android.xml.new
 	if [ ! -f navit.dtd ]; then cp -f $(top_srcdir)/navit/navit.dtd .; fi
-#	now apply any other xslt files
-	for i in $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt)))); do if [ "$${i%.xslt}" != "$$i" ]; then j=`basename $$i` ; if [ "$$j" != "android.xslt" ] ; then echo "Android: Applying $$i" ; @SAXON@ -snone navit_android.xml.new $(srcdir)/"$$i" >navit_android.xml.new.tmp || exit ; mv navit_android.xml.new.tmp navit_android.xml.new || exit ; fi ; fi ; done
+
+#	# now apply any other xslt files (this would allow for pedestrian plugin)
+#	for i in $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt)))); do if [ "$${i%.xslt}" != "$$i" ]; then j=`basename $$i` ; if [ "$$j" != "android.xslt" ] ; then echo "Android: Applying $$i" ; @SAXON@ -snone navit_android.xml.new $(srcdir)/"$$i" >navit_android.xml.new.tmp || exit ; mv navit_android.xml.new.tmp navit_android.xml.new || exit ; fi ; fi ; done
+#	# for now disable pedestrian plugin (zoff99)
+
 	@SAXON@ -snone navit_android.xml.new $(srcdir)/xslt/android_mdpi.xslt >navit_android_mdpi.xml.tmp
 	@SAXON@ -snone navit_android.xml.new $(srcdir)/xslt/android_ldpi.xslt >navit_android_ldpi.xml.tmp
 	@SAXON@ -snone navit_android.xml.new $(srcdir)/xslt/android_hdpi.xslt >navit_android_hdpi.xml.tmp
@@ -155,7 +158,7 @@ apkg: apkg-all
 apkg-release: apkg-all
 	cd android && ant release
 	jarsigner $$(cat ~/.keystore_args) android/bin/Navit-unsigned.apk mykey
-#	zipalign -f 4  android/bin/Navit-unsigned.apk android/bin/Navit-signed.apk
+#	zipalign -f 4  android/bin/Navit-unsigned.apk android/bin/Navit-unsigned-aligned.apk
 else
 navit_SOURCES = start.c
 navit_LDADD = lib@LIBNAVIT@.la
diff --git a/navit/navit/android.c b/navit/navit/android.c
index 64147784e..032d26f4d 100644
--- a/navit/navit/android.c
+++ b/navit/navit/android.c
@@ -303,6 +303,8 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j
 			struct mapset *ms;
 			struct map *map;
 
+			// this procedure is not used at the moment!!
+
 			// hopefully use a newly downloaded map, we just hope its set in navit.xml (make nicer soon)
 			// remove all curents maps
 			// ******global_navit->mapsets=NULL; // is this the correct way to clear the list?
diff --git a/navit/navit/android/res/drawable-hdpi/icon.png b/navit/navit/android/res/drawable-hdpi/icon.png
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/navit/navit/android/res/drawable-hdpi/icon.png
diff --git a/navit/navit/android/res/drawable-ldpi/icon.png b/navit/navit/android/res/drawable-ldpi/icon.png
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/navit/navit/android/res/drawable-ldpi/icon.png
diff --git a/navit/navit/android/res/drawable-mdpi/icon.png b/navit/navit/android/res/drawable-mdpi/icon.png
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/navit/navit/android/res/drawable-mdpi/icon.png
diff --git a/navit/navit/xslt/osd_android_minimum.xslt b/navit/navit/xslt/osd_android_minimum.xslt
index b7950e771..063e3b08f 100644
--- a/navit/navit/xslt/osd_android_minimum.xslt
+++ b/navit/navit/xslt/osd_android_minimum.xslt
@@ -15,11 +15,11 @@
 		</xsl:variable>
 		<osd type="compass" enabled="yes" x="{round(-60*number($OSD_SIZE_)*number($OSD_FACTOR_))}" y="{round(-80*number($OSD_SIZE_)*number($OSD_FACTOR_))}" w="{round(60*number($OSD_SIZE_)*number($OSD_FACTOR_))}" h="{round(80*number($OSD_SIZE_)*number($OSD_FACTOR_))}" font_size="{round(200*number($OSD_SIZE_)*number($OSD_FACTOR_))}" osd_configuration="1"/>
 		<xsl:text>&#x0A;        </xsl:text>
-		<osd type="text" label="${{navigation.item.destination_length[named]}}\n${{navigation.item.destination_time[arrival]}}" x="{round(-60*number($OSD_SIZE_))}" y="0" w="{round(60*number($OSD_SIZE_))}" h="{round(40*number($OSD_SIZE_))}" font_size="{round(200*number($OSD_SIZE_))}" osd_configuration="1"/>
+		<osd type="text" label="${{navigation.item.destination_length[named]}}\n${{navigation.item.destination_time[arrival]}}" x="{round(-60*number($OSD_SIZE_)*number($OSD_FACTOR_))}" y="0" w="{round(60*number($OSD_SIZE_)*number($OSD_FACTOR_))}" h="{round(40*number($OSD_SIZE_)*number($OSD_FACTOR_))}" font_size="{round(200*number($OSD_SIZE_)*number($OSD_FACTOR_))}" osd_configuration="1"/>
 		<xsl:text>&#x0A;        </xsl:text>
 		<osd type="navigation_next_turn" x="0" y="{round(-60*number($OSD_SIZE_)*number($OSD_FACTOR_))}" w="{round(60*number($OSD_SIZE_)*number($OSD_FACTOR_))}" h="{round(60*number($OSD_SIZE_)*number($OSD_FACTOR_))-round(20*number($OSD_SIZE_))}" icon_src="%s_wh_{round(44*number($OSD_SIZE_))}_{round(44*number($OSD_SIZE_))}.png" osd_configuration="1"/>
 		<xsl:text>&#x0A;        </xsl:text>
-		<osd type="text" label="${{navigation.item[1].length[named]}}" x="0" y="{round(-20*number($OSD_SIZE_))}" w="{round(60*number($OSD_SIZE_))}" h="{round(20*number($OSD_SIZE_))}" font_size="{round(200*number($OSD_SIZE_))}" osd_configuration="1"/>
+		<osd type="text" label="${{navigation.item[1].length[named]}}" x="0" y="{round(-20*number($OSD_SIZE_))}" w="{round(60*number($OSD_SIZE_)*number($OSD_FACTOR_))}" h="{round(20*number($OSD_SIZE_))}" font_size="{round(200*number($OSD_SIZE_))}" osd_configuration="1"/>
 		<xsl:text>&#x0A;        </xsl:text>
 		<osd type="button" src="gui_zoom_in_{round(48*number($OSD_SIZE_))}_{round(48*number($OSD_SIZE_))}.png" command="zoom_in()" x="0" y="0" osd_configuration="1"/>
 		<xsl:text>&#x0A;        </xsl:text>