diff options
author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-01-07 13:26:11 +0000 |
---|---|---|
committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-01-07 13:26:11 +0000 |
commit | f62bfb4396124d70e309b58da263dadbf6d96e71 (patch) | |
tree | a1b5ed73c24e841a7d25e01f2926324e940d7194 /navit/android | |
parent | 1905f4b1ea50ef2fac0640546687a07e1be68c8b (diff) | |
download | navit-svn-f62bfb4396124d70e309b58da263dadbf6d96e71.tar.gz |
Add:port_android:Properly handle densities. Add support for navit_x[x][x]hdpi.xml.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5991 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/android')
-rw-r--r-- | navit/android/src/org/navitproject/navit/Navit.java | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index 5cafb988..873bbb71 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -307,7 +307,7 @@ public class Navit extends Activity int height_ = display_.getHeight();
metrics = new DisplayMetrics();
display_.getMetrics(Navit.metrics);
- int densityDpi = (int)(( Navit.metrics.density*160)+.5f);
+ int densityDpi = (int)(( Navit.metrics.density*160)-.5f);
Log.e("Navit", "Navit -> pixels x=" + width_ + " pixels y=" + height_);
Log.e("Navit", "Navit -> dpi=" + densityDpi);
Log.e("Navit", "Navit -> density=" + Navit.metrics.density);
@@ -331,15 +331,27 @@ public class Navit extends Activity {
my_display_density = "mdpi";
}
- else if (densityDpi < 320)
+ else if (densityDpi < 240)
{
my_display_density = "hdpi";
}
+ else if (densityDpi < 320)
+ {
+ my_display_density = "xhdpi";
+ }
+ else if (densityDpi < 480)
+ {
+ my_display_density = "xxhdpi";
+ }
+ else if (densityDpi < 640)
+ {
+ my_display_density = "xxxhdpi";
+ }
else
{
- Log.e("Navit", "found xhdpi device, this is not fully supported!!");
- Log.e("Navit", "using hdpi values");
- my_display_density = "hdpi";
+ Log.e("Navit", "found device of very high density ("+densityDpi+")");
+ Log.e("Navit", "using xxxhdpi values");
+ my_display_density = "xxxhdpi";
}
if (!extractRes("navit" + my_display_density, NAVIT_DATA_DIR + "/share/navit.xml"))
|