From 83cc2e5991f0013fd95b88af257560b526001fc0 Mon Sep 17 00:00:00 2001 From: Julian Winkler Date: Tue, 22 Aug 2023 13:27:28 +0200 Subject: [PATCH] load the default Application theme on startup --- src/api-impl/android/content/Context.java | 3 +++ src/api-impl/android/content/res/Resources.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/api-impl/android/content/Context.java b/src/api-impl/android/content/Context.java index 52191ccd..edb94e35 100644 --- a/src/api-impl/android/content/Context.java +++ b/src/api-impl/android/content/Context.java @@ -100,6 +100,9 @@ public class Context extends Object { Class cls = Class.forName(className).asSubclass(Application.class); Constructor constructor = cls.getConstructor(); application = constructor.newInstance(); + ResXmlAttribute application_theme = manifest.getApplicationElement().searchAttributeByResourceId(AndroidManifestBlock.ID_theme); + if (application_theme != null) + application.setTheme(application_theme.getData()); this_application = application; return application; } diff --git a/src/api-impl/android/content/res/Resources.java b/src/api-impl/android/content/res/Resources.java index 116f55de..47f853bc 100644 --- a/src/api-impl/android/content/res/Resources.java +++ b/src/api-impl/android/content/res/Resources.java @@ -1211,7 +1211,7 @@ public class Resources { * if not already defined in the theme. */ public void applyStyle(int resid, boolean force) { - themeMap = mAssets.loadStyle(resid); + themeMap.putAll(mAssets.loadStyle(resid)); } /**