diff options
author | BogDan Vatra <bogdan@kdab.com> | 2016-03-17 17:52:34 +0200 |
---|---|---|
committer | BogDan Vatra <bogdan@kdab.com> | 2016-03-22 09:14:14 +0000 |
commit | a3269e18012129bab69d9744147f48025f42ddf1 (patch) | |
tree | 6ed2c8b0926c0b2036a0cbaecdb81d808d4d2f18 /src/android/jar | |
parent | e4d79e1fdeb6b26ba0b12b578daacf7cd672b960 (diff) |
Allow the user to choose how much from Android theme is extracted
This way Quick Controls 2 users will have a much faster start up and the
extraction time is reduced x10.
[ChangeLog][Android] Allow the user to choose how much from Android
theme is extracted.
Change-Id: I063086251880d50d7fdd72ee35536c4094b47f74
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/android/jar')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java | 6 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java index 3fcc5b8516..46a443c365 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java +++ b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java @@ -270,6 +270,7 @@ public class ExtractStyle { Context m_context; final int defaultBackgroundColor; final int defaultTextColor; + final boolean m_minimal; class SimpleJsonWriter { @@ -984,7 +985,7 @@ public class ExtractStyle { public JSONObject getDrawable(Object drawable, String filename, Rect padding) { - if (drawable == null) + if (drawable == null || m_minimal) return null; DrawableCache dc = m_drawableCache.get(filename); @@ -1986,9 +1987,10 @@ public class ExtractStyle { return json; } - public ExtractStyle(Context context, String extractPath) + public ExtractStyle(Context context, String extractPath, boolean minimal) { // Log.i(MinistroService.TAG, "Extract " + extractPath); + m_minimal = minimal; m_extractPath = extractPath + "/"; new File(m_extractPath).mkdirs(); // MinistroActivity.nativeChmode(m_extractPath, 0755); diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index 61a824e749..ac471bf126 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -113,6 +113,7 @@ public class QtActivityDelegate private static final String STATIC_INIT_CLASSES_KEY = "static.init.classes"; private static final String NECESSITAS_API_LEVEL_KEY = "necessitas.api.level"; private static final String EXTRACT_STYLE_KEY = "extract.android.style"; + private static final String EXTRACT_STYLE_MINIMAL_KEY = "extract.android.style.option"; private static String m_environmentVariables = null; private static String m_applicationParameters = null; @@ -509,7 +510,8 @@ public class QtActivityDelegate if (loaderParams.containsKey(EXTRACT_STYLE_KEY)) { String path = loaderParams.getString(EXTRACT_STYLE_KEY); - new ExtractStyle(m_activity, path); + new ExtractStyle(m_activity, path, loaderParams.containsKey(EXTRACT_STYLE_MINIMAL_KEY) && + loaderParams.getBoolean(EXTRACT_STYLE_MINIMAL_KEY)); } try { |