Skip to content

Commit 7e29c3b

Browse files
committed
Merge branch 'outsystems/14.0.x' into fix/RDMR-1284/statusbar-font-color
2 parents 42ea693 + 7fe5821 commit 7e29c3b

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

framework/src/org/apache/cordova/CordovaActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ public void onCreate(Bundle savedInstanceState) {
119119
// need to activate preferences before super.onCreate to avoid "requestFeature() must be called before adding content" exception
120120
loadConfig();
121121

122-
canEdgeToEdge = preferences.getBoolean("AndroidEdgeToEdge", false)
123-
&& Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM;
122+
canEdgeToEdge = preferences.getBoolean("AndroidEdgeToEdge", false);
124123

125124
String logLevel = preferences.getString("loglevel", "ERROR");
126125
LOG.setLogLevel(logLevel);

framework/src/org/apache/cordova/SystemBarPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public class SystemBarPlugin extends CordovaPlugin {
5656
protected void pluginInitialize() {
5757
context = cordova.getContext();
5858
resources = context.getResources();
59-
canEdgeToEdge = preferences.getBoolean("AndroidEdgeToEdge", false)
60-
&& Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM;
59+
canEdgeToEdge = preferences.getBoolean("AndroidEdgeToEdge", false);
6160
edgeToEdgeGlyphTheme = preferences.getString("EdgeToEdgeGlyphTheme", null);
61+
6262
}
6363

6464
@Override

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cordova-android",
3-
"version": "14.0.1+0.4.0",
3+
"version": "14.0.1+0.5.0",
44
"description": "cordova-android release",
55
"types": "./types/index.d.ts",
66
"main": "lib/Api.js",

0 commit comments

Comments
 (0)