Fix:android:Fix building for android 1.5

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

diff --git a/navit/navit/android/AndroidManifest.xml.cmake b/navit/navit/android/AndroidManifest.xml.cmake
index 6e23ac8..e7784f0 100644 (file)
--- a/navit/navit/android/AndroidManifest.xml.cmake
+++ b/navit/navit/android/AndroidManifest.xml.cmake
@@ -25,7 +25,7 @@
         <activity android:name=".NavitDownloadSelectMapActivity"></activity>
         <activity android:name=".NavitAddressResultListActivity"></activity>
     </application>
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="@ANDROID_API_VERSION@"/>
+    <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="@ANDROID_API_VERSION@"/>
     <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:resizeable="true" android:anyDensity="true"/>
     @ANDROID_PERMISSIONS@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

diff --git a/navit/navit/android/src/org/navitproject/navit/Navit.java b/navit/navit/android/src/org/navitproject/navit/Navit.java
index cb1decc..b2c3b72 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/navit/android/src/org/navitproject/navit/Navit.java
@@ -394,8 +394,9 @@ public class Navit extends Activity implements Handler.Callback
                int height_ = display_.getHeight();\r
                metrics = new DisplayMetrics();\r
                display_.getMetrics(Navit.metrics);\r
+               int densityDpi = (int)(( Navit.metrics.density*160)+.5f);\r
                Log.e("Navit", "Navit -> pixels x=" + width_ + " pixels y=" + height_);\r
-               Log.e("Navit", "Navit -> dpi=" + Navit.metrics.densityDpi);\r
+               Log.e("Navit", "Navit -> dpi=" + densityDpi);\r
                Log.e("Navit", "Navit -> density=" + Navit.metrics.density);\r
                Log.e("Navit", "Navit -> scaledDensity=" + Navit.metrics.scaledDensity);\r
 \r
@@ -410,15 +411,15 @@ public class Navit extends Activity implements Handler.Callback
                        Log.e("Navit", "Failed to extract language resource " + langc);\r
                }\r
 \r
-               if (Navit.metrics.densityDpi <= 120)\r
+               if (densityDpi <= 120)\r
                {\r
                        my_display_density = "ldpi";\r
                }\r
-               else if (Navit.metrics.densityDpi <= 160)\r
+               else if (densityDpi <= 160)\r
                {\r
                        my_display_density = "mdpi";\r
                }\r
-               else if (Navit.metrics.densityDpi < 320)\r
+               else if (densityDpi < 320)\r
                {\r
                        my_display_density = "hdpi";\r
                }\r

diff --git a/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java
index be52360..544e184 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -241,7 +241,6 @@ public class NavitGraphics
                                protected void onSizeChanged(int w, int h, int oldw, int oldh)
                                {
                                        Log.e("Navit", "NavitGraphics -> onSizeChanged pixels x=" + w + " pixels y=" + h);
-                                       Log.e("Navit", "NavitGraphics -> onSizeChanged dpi=" + Navit.metrics.densityDpi);
                                        Log.e("Navit", "NavitGraphics -> onSizeChanged density=" + Navit.metrics.density);
                                        Log.e("Navit", "NavitGraphics -> onSizeChanged scaledDensity="
                                                        + Navit.metrics.scaledDensity);