diff options
Diffstat (limited to 'tests/auto/android/src/org')
| -rw-r--r-- | tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java | 10 | ||||
| -rw-r--r-- | tests/auto/android/src/org/qtproject/qt5/android/QtNative.java | 13 |
2 files changed, 15 insertions, 8 deletions
diff --git a/tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java b/tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java index 6242f55488..ed190fdc1b 100644 --- a/tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java +++ b/tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java @@ -62,9 +62,9 @@ public class QtActivity extends Activity { QtNative.loadQtLibraries(libs); // start application - final String envPaths = "NECESSITAS_API_LEVEL=2\tHOME=" + getDir("files", MODE_WORLD_WRITEABLE).getAbsolutePath() + - "\tTMPDIR=" + getDir("files", MODE_WORLD_WRITEABLE).getAbsolutePath() + - "\tCACHE_PATH=" + getDir("files", MODE_WORLD_WRITEABLE).getAbsolutePath(); + final String envPaths = "NECESSITAS_API_LEVEL=2\tHOME=" + getDir("files", MODE_WORLD_WRITEABLE | MODE_WORLD_READABLE).getAbsolutePath() + + "\tTMPDIR=" + getDir("files", MODE_WORLD_WRITEABLE | MODE_WORLD_READABLE).getAbsolutePath() + + "\tCACHE_PATH=" + getDir("files", MODE_WORLD_WRITEABLE | MODE_WORLD_READABLE).getAbsolutePath(); if (environment != null && environment.length() > 0) environment = envPaths + "\t" + environment; else @@ -102,6 +102,7 @@ public class QtActivity extends Activity { } if (getIntent().getExtras().containsKey("lib_name")) { mainLib = getIntent().getExtras().getString("lib_name"); + libraryList.add(mainLib); int slash = mainLib.lastIndexOf("/"); if (slash >= 0) { nativeLibDir = mainLib.substring(0, slash+1); @@ -120,6 +121,7 @@ public class QtActivity extends Activity { // TODO Auto-generated catch block e.printStackTrace(); } + finish(); System.exit(0); } String[] libs = new String[libraryList.size()]; @@ -136,7 +138,7 @@ public class QtActivity extends Activity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getDir("files", MODE_WORLD_WRITEABLE); + getDir("files", MODE_WORLD_WRITEABLE | MODE_WORLD_READABLE); requestWindowFeature(Window.FEATURE_NO_TITLE); m_quitApp = true; QtNative.setMainActivity(this); diff --git a/tests/auto/android/src/org/qtproject/qt5/android/QtNative.java b/tests/auto/android/src/org/qtproject/qt5/android/QtNative.java index d9995e3178..a61543d31a 100644 --- a/tests/auto/android/src/org/qtproject/qt5/android/QtNative.java +++ b/tests/auto/android/src/org/qtproject/qt5/android/QtNative.java @@ -164,7 +164,8 @@ public class QtNative extends Application m_displayMetricsDesktopWidthPixels, m_displayMetricsDesktopHeightPixels, m_displayMetricsXDpi, - m_displayMetricsYDpi); + m_displayMetricsYDpi, + 1.0); startQtApplication(f.getAbsolutePath()+"\t"+params, environment); m_started = true; } @@ -183,7 +184,7 @@ public class QtNative extends Application synchronized (m_mainActivityMutex) { if (m_started) { - setDisplayMetrics(screenWidthPixels, screenHeightPixels, desktopWidthPixels, desktopHeightPixels, XDpi, YDpi); + setDisplayMetrics(screenWidthPixels, screenHeightPixels, desktopWidthPixels, desktopHeightPixels, XDpi, YDpi, 1.0); } else { m_displayMetricsScreenWidthPixels = screenWidthPixels; m_displayMetricsScreenHeightPixels = screenHeightPixels; @@ -379,8 +380,12 @@ public class QtNative extends Application // screen methods public static native void setDisplayMetrics(int screenWidthPixels, - int screenHeightPixels, int desktopWidthPixels, - int desktopHeightPixels, double XDpi, double YDpi); + int screenHeightPixels, + int desktopWidthPixels, + int desktopHeightPixels, + double XDpi, + double YDpi, + double scaledDensity); public static native void handleOrientationChanged(int newOrientation); // screen methods |