From 1a8e36ccd306cd87928a98060b810fd174fbc50b Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Mon, 14 Aug 2017 11:41:46 -0700 Subject: [PATCH 1/2] CB-13177: Updating to API Level 26 --- framework/project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/project.properties b/framework/project.properties index df3c73c4..c48b00b8 100644 --- a/framework/project.properties +++ b/framework/project.properties @@ -10,7 +10,7 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=android-25 +target=android-26 apk-configurations= renderscript.opt.level=O0 android.library=true From 5bda4df7fad5460d5108d7af3ce19f6072e8bcdc Mon Sep 17 00:00:00 2001 From: Simon MacDonald Date: Mon, 14 Aug 2017 20:57:44 -0400 Subject: [PATCH 2/2] Revert CB-12015: initial-scale values less than 1.0 are ignored on Android --- .../src/org/apache/cordova/engine/SystemWebViewEngine.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java b/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java index 3be7d940..0fa02767 100755 --- a/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java +++ b/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java @@ -210,11 +210,6 @@ public class SystemWebViewEngine implements CordovaWebViewEngine { settings.setAppCachePath(databasePath); settings.setAppCacheEnabled(true); - // Enable scaling - // Fix for CB-12015 - settings.setUseWideViewPort(true); - settings.setLoadWithOverviewMode(true); - // Fix for CB-1405 // Google issue 4641 String defaultUserAgent = settings.getUserAgentString();