summaryrefslogtreecommitdiffstats
path: root/src/android/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/android/java')
-rw-r--r--src/android/java/res/layout/splash.xml4
-rw-r--r--src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/android/java/res/layout/splash.xml b/src/android/java/res/layout/splash.xml
index 6875521a12..476d91a844 100644
--- a/src/android/java/res/layout/splash.xml
+++ b/src/android/java/res/layout/splash.xml
@@ -1,2 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" />
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" />
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 0c52bc7530..75f10ad3ba 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
@@ -187,7 +187,7 @@ public class QtActivity extends Activity
QT_ANDROID_THEMES = new String[] {"Theme_Light"};
QT_ANDROID_DEFAULT_THEME = "Theme_Light";
}
- else if (Build.VERSION.SDK_INT >= 11 && Build.VERSION.SDK_INT <= 13) {
+ else if ((Build.VERSION.SDK_INT >= 11 && Build.VERSION.SDK_INT <= 13) || Build.VERSION.SDK_INT == 21){
QT_ANDROID_THEMES = new String[] {"Theme_Holo_Light"};
QT_ANDROID_DEFAULT_THEME = "Theme_Holo_Light";
} else {