From: <ri...@us...> - 2011-03-10 15:04:17
|
Revision: 4324 http://navit.svn.sourceforge.net/navit/?rev=4324&view=rev Author: rikky Date: 2011-03-10 15:04:11 +0000 (Thu, 10 Mar 2011) Log Message: ----------- Fix:android:Choose a appropriate config for all display densities. Modified Paths: -------------- trunk/navit/navit/android/src/org/navitproject/navit/Navit.java Modified: trunk/navit/navit/android/src/org/navitproject/navit/Navit.java =================================================================== --- trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2011-03-10 12:14:18 UTC (rev 4323) +++ trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2011-03-10 15:04:11 UTC (rev 4324) @@ -410,18 +410,15 @@ Log.e("Navit", "Failed to extract language resource " + langc); } - my_display_density = "mdpi"; - // hdpi display - if (Navit.metrics.densityDpi == 240) + if (Navit.metrics.densityDpi <= 120) { - my_display_density = "hdpi"; - if (!extractRes("navithdpi", NAVIT_DATA_DIR + "/share/navit.xml")) + my_display_density = "ldpi"; + if (!extractRes("navitldpi", NAVIT_DATA_DIR + "/share/navit.xml")) { - Log.e("Navit", "Failed to extract navit.xml for hdpi device(s)"); + Log.e("Navit", "Failed to extract navit.xml for ldpi device(s)"); } } - // mdpi display - else if (Navit.metrics.densityDpi == 160) + else if (Navit.metrics.densityDpi <= 160) { my_display_density = "mdpi"; if (!extractRes("navitmdpi", NAVIT_DATA_DIR + "/share/navit.xml")) @@ -429,34 +426,15 @@ Log.e("Navit", "Failed to extract navit.xml for mdpi device(s)"); } } - // ldpi display - else if (Navit.metrics.densityDpi == 120) + else { - my_display_density = "ldpi"; - if (!extractRes("navitldpi", NAVIT_DATA_DIR + "/share/navit.xml")) - { - Log.e("Navit", "Failed to extract navit.xml for ldpi device(s)"); - } - } - // xhdpi display - else if (Navit.metrics.densityDpi == 320) - { - Log.e("Navit", "found xhdpi device, this is not fully supported!!"); - Log.e("Navit", "using hdpi values"); my_display_density = "hdpi"; if (!extractRes("navithdpi", NAVIT_DATA_DIR + "/share/navit.xml")) { - Log.e("Navit", "Failed to extract navit.xml for xhdpi device(s)"); + Log.e("Navit", "Failed to extract navit.xml for hdpi device(s)"); } } - else - { - /* default, meaning we just dont know what display this is */ - if (!extractRes("navit", NAVIT_DATA_DIR + "/share/navit.xml")) - { - Log.e("Navit", "Failed to extract navit.xml (default version)"); - } - } + // Debug.startMethodTracing("calc"); // --> dont use!! NavitMain(this, langu, android.os.Build.VERSION.SDK_INT); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |