diff options
| author | BogDan Vatra <bogdan@kde.org> | 2014-02-21 16:08:06 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-21 15:50:52 +0100 |
| commit | 4d08d80be60af14c5daed7c6f8d37538aea6c429 (patch) | |
| tree | b770deebb1ed9abff1e6b5c8e5dfd6f2dd226d2e /src/android/java | |
| parent | 5e05c230af6b53d4323d3d8a445c5af1b1ba546a (diff) | |
Rework the splash screen for Android.
Allow the developers to define a splash screen which will be visible
until the first window is created.
[ChangeLog][Android] Allow the developers to define a splash
screen which will be visible until the first window is created.
Task-number: QTBUG-30652
Change-Id: I5da80be417ffffb03e66009f45745d4b387d2912
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/android/java')
| -rw-r--r-- | src/android/java/AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | src/android/java/res/layout/splash.xml | 13 | ||||
| -rw-r--r-- | src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java | 4 | ||||
| -rw-r--r-- | src/android/java/version.xml | 2 |
4 files changed, 7 insertions, 17 deletions
diff --git a/src/android/java/AndroidManifest.xml b/src/android/java/AndroidManifest.xml index defbe502ef..3a2a52b874 100644 --- a/src/android/java/AndroidManifest.xml +++ b/src/android/java/AndroidManifest.xml @@ -29,8 +29,11 @@ <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/> <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/> <!-- Messages maps --> + <!-- Splash screen --> - <meta-data android:name="android.app.splash_screen" android:resource="@layout/splash"/> + <!-- + <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/> + --> <!-- Splash screen --> </activity> </application> diff --git a/src/android/java/res/layout/splash.xml b/src/android/java/res/layout/splash.xml deleted file mode 100644 index 6b0d492dd5..0000000000 --- a/src/android/java/res/layout/splash.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_gravity="center" - > - <ImageView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:scaleType="fitXY" - /> -</LinearLayout> 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 b2f92c04e9..3a0eaa77d6 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 @@ -858,8 +858,8 @@ public class QtActivity extends Activity if (null == getLastNonConfigurationInstance()) { // if splash screen is defined, then show it - if (m_activityInfo.metaData.containsKey("android.app.splash_screen") ) - setContentView(m_activityInfo.metaData.getInt("android.app.splash_screen")); + if (m_activityInfo.metaData.containsKey("android.app.splash_screen_drawable")) + getWindow().setBackgroundDrawableResource(m_activityInfo.metaData.getInt("android.app.splash_screen_drawable")); startApp(true); } } diff --git a/src/android/java/version.xml b/src/android/java/version.xml index bdcf915c06..e05bba7588 100644 --- a/src/android/java/version.xml +++ b/src/android/java/version.xml @@ -1,4 +1,4 @@ -<version value="5.2"> +<version value="5.3"> <ignore> <file>AndroidManifest.xml</file> <file>libs.xml</file> |