fix(android)!: Adding keyboard insets handling (#8236)

Author: theproducer

android/capacitor/src/main/java/com/getcapacitor/CapConfig.java

@@ -54,7 +54,6 @@ public class CapConfig {
     private String errorPath;
     private boolean zoomableWebView = false;
     private boolean resolveServiceWorkerRequests = true;
-    private String adjustMarginsForEdgeToEdge = "auto";
 
     // Embedded
     private String startPath;
@@ -182,7 +181,6 @@ private CapConfig(Builder builder) {
         this.errorPath = builder.errorPath;
         this.zoomableWebView = builder.zoomableWebView;
         this.resolveServiceWorkerRequests = builder.resolveServiceWorkerRequests;
-        this.adjustMarginsForEdgeToEdge = builder.adjustMarginsForEdgeToEdge;
 
         // Embedded
         this.startPath = builder.startPath;
@@ -288,7 +286,6 @@ private void deserializeConfig(@Nullable Context context) {
         webContentsDebuggingEnabled = JSONUtils.getBoolean(configJSON, "android.webContentsDebuggingEnabled", isDebug);
         zoomableWebView = JSONUtils.getBoolean(configJSON, "android.zoomEnabled", JSONUtils.getBoolean(configJSON, "zoomEnabled", false));
         resolveServiceWorkerRequests = JSONUtils.getBoolean(configJSON, "android.resolveServiceWorkerRequests", true);
-        adjustMarginsForEdgeToEdge = JSONUtils.getString(configJSON, "android.adjustMarginsForEdgeToEdge", "auto");
 
         String logBehavior = JSONUtils.getString(
             configJSON,
@@ -405,10 +402,6 @@ public boolean isUsingLegacyBridge() {
         return useLegacyBridge;
     }
 
-    public String adjustMarginsForEdgeToEdge() {
-        return adjustMarginsForEdgeToEdge;
-    }
-
     public int getMinWebViewVersion() {
         if (minWebViewVersion < MINIMUM_ANDROID_WEBVIEW_VERSION) {
             Logger.warn("Specified minimum webview version is too low, defaulting to " + MINIMUM_ANDROID_WEBVIEW_VERSION);
@@ -589,7 +582,6 @@ public static class Builder {
         private int minHuaweiWebViewVersion = DEFAULT_HUAWEI_WEBVIEW_VERSION;
         private boolean zoomableWebView = false;
         private boolean resolveServiceWorkerRequests = true;
-        private String adjustMarginsForEdgeToEdge = "auto";
 
         // Embedded
         private String startPath = null;

android/capacitor/src/main/java/com/getcapacitor/plugin/SystemBars.java

@@ -123,7 +123,18 @@ private void setupSafeAreaInsets(boolean hasFixedWebView, boolean hasMetaViewpor
             }
 
             Insets safeArea = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout());
-            injectSafeAreaCSS(safeArea.top, safeArea.right, safeArea.bottom, safeArea.left);
+            Insets imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime());
+            boolean keyboardVisible = insets.isVisible(WindowInsetsCompat.Type.ime());
+
+            int bottomInsets = safeArea.bottom;
+
+            if (keyboardVisible) {
+                // When https://issues.chromium.org/issues/457682720 is fixed and released,
+                // add behind a WebView version check
+                bottomInsets = imeInsets.bottom - bottomInsets;
+            }
+
+            injectSafeAreaCSS(safeArea.top, safeArea.right, bottomInsets, safeArea.left);
 
             return WindowInsetsCompat.CONSUMED;
         });

cli/src/declarations.ts

@@ -297,17 +297,6 @@ export interface CapacitorConfig {
      * @default true
      */
     resolveServiceWorkerRequests?: boolean;
-
-    /**
-     * If set to "force", margins will be adjusted for edge to edge regardless of any other settings.
-     * If set to "auto", will check for Android 15 and the setting of [windowOptOutEdgeToEdgeEnforcement](https://developer.android.com/reference/android/R.attr#windowOptOutEdgeToEdgeEnforcement) and will adjust margins if on Android 15 and windowOptOutEdgeToEdgeEnforcement is false/missing.
-     * If set to "disable", or is missing, will not adjust margins at all.
-     * In Capacitor 8, this default will be changed to 'auto'
-     *
-     * @since 7.1.0
-     * @default disable
-     */
-    adjustMarginsForEdgeToEdge?: 'auto' | 'force' | 'disable';
   };
 
   ios?: {