diff options
| author | BogDan Vatra <bogdan@kde.org> | 2013-09-09 17:27:26 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-10 11:52:16 +0200 |
| commit | d6d119ac6e606a30993bfea1ac3309f74d15bedc (patch) | |
| tree | eb4eeb1ad19b3e96e7dfd3d4666e78d2d7c9ca0c /src/android | |
| parent | b0b786a2f05e9451a65519ab8904f55c35f51b7d (diff) | |
Fix Android Style plugin.
Task-number: QTBUG-29565
Change-Id: Iedb861962e3638bcbdf9d9a72a47bebc63b425b9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java | 15 | ||||
| -rw-r--r-- | src/android/java/version.xml | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java index fd0c6b14e3..83ed1582bf 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java @@ -82,7 +82,7 @@ import android.view.ActionMode.Callback; public class QtActivity extends Activity { private final static int MINISTRO_INSTALL_REQUEST_CODE = 0xf3ee; // request code used to know when Ministro instalation is finished - private static final int MINISTRO_API_LEVEL = 3; // Ministro api level (check IMinistro.aidl file) + private static final int MINISTRO_API_LEVEL = 4; // Ministro api level (check IMinistro.aidl file) private static final int NECESSITAS_API_LEVEL = 2; // Necessitas api level used by platform plugin private static final int QT_VERSION = 0x050100; // This app requires at least Qt version 5.1.0 @@ -119,7 +119,7 @@ public class QtActivity extends Activity // and must be separated with "\t" // e.g "-param1\t-param2=value2\t-param3\tvalue3" - private static final String ENVIRONMENT_VARIABLES = "QT_USE_ANDROID_NATIVE_STYLE=0\t"; + private String ENVIRONMENT_VARIABLES = "QT_USE_ANDROID_NATIVE_STYLE=1\t"; // use this variable to add any environment variables to your application. // the env vars must be separated with "\t" // e.g. "ENV_VAR1=1\tENV_VAR2=2\t" @@ -127,7 +127,14 @@ public class QtActivity extends Activity // * QT_USE_ANDROID_NATIVE_STYLE - 1 to use the android widget style if available, // note that the android style plugin in Qt 5.1 is not fully functional. + private static final String QT_ANDROID_THEME = "light"; // sets the default theme to light. Possible values are: + // * "" - for the device default dark theme + // * "light" - for the device default light theme + // * "holo" - for the holo dark theme + // * "holo_light" - for the holo light theme + private static final int INCOMPATIBLE_MINISTRO_VERSION = 1; // Incompatible Ministro version. Ministro needs to be upgraded. + private static final String DISPLAY_DPI_KEY = "display.dpi"; private static final int BUFFER_SIZE = 1024; private ActivityInfo m_activityInfo = null; // activity info object, used to access the libs and the strings @@ -246,6 +253,7 @@ public class QtActivity extends Activity parameters.putString(APPLICATION_PARAMETERS_KEY, APPLICATION_PARAMETERS); parameters.putStringArray(SOURCES_KEY, m_sources); parameters.putString(REPOSITORY_KEY, m_repository); + parameters.putInt(DISPLAY_DPI_KEY, QtActivity.this.getResources().getDisplayMetrics().densityDpi); m_service.requestLoader(m_ministroCallback, parameters); } } catch (RemoteException e) { @@ -671,7 +679,8 @@ public class QtActivity extends Activity QtApplication.invokeDelegateMethod(QtApplication.onCreate, savedInstanceState); return; } - + ENVIRONMENT_VARIABLES += "\tQT_ANDROID_THEME=" + QT_ANDROID_THEME + + "/\tQT_ANDROID_THEME_DISPLAY_DPI=" + getResources().getDisplayMetrics().densityDpi + "\t"; requestWindowFeature(Window.FEATURE_NO_TITLE); try { m_activityInfo = getPackageManager().getActivityInfo(getComponentName(), PackageManager.GET_META_DATA); diff --git a/src/android/java/version.xml b/src/android/java/version.xml index e709357ba6..bdcf915c06 100644 --- a/src/android/java/version.xml +++ b/src/android/java/version.xml @@ -1,4 +1,4 @@ -<version value="5"> +<version value="5.2"> <ignore> <file>AndroidManifest.xml</file> <file>libs.xml</file> |