diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-10 15:04:11 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-10 15:04:11 +0000 |
| commit | 5ff6393ba6ea93398065b24f77f2eed19b31eb1c (patch) | |
| tree | e96cdd77cc0437e93d228425f3410633b094a360 | |
| parent | f53cd297d716e421c4d510ded66aeb9d7d96f253 (diff) | |
| download | navit-svn-5ff6393ba6ea93398065b24f77f2eed19b31eb1c.tar.gz | |
Fix:android:Choose a appropriate config for all display densities.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4324 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | navit/android/src/org/navitproject/navit/Navit.java | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index 9aa97d34..30d99bd1 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -410,18 +410,15 @@ public class Navit extends Activity implements Handler.Callback 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 @@ public class Navit extends Activity implements Handler.Callback Log.e("Navit", "Failed to extract navit.xml for mdpi device(s)");
}
}
- // ldpi display
- else if (Navit.metrics.densityDpi == 120)
- {
- 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)
+ else
{
- 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)");
- }
- }
- 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)");
+ Log.e("Navit", "Failed to extract navit.xml for hdpi device(s)");
}
}
+
// Debug.startMethodTracing("calc");
// --> dont use!! NavitMain(this, langu, android.os.Build.VERSION.SDK_INT);
|