Revert "fix(android): fixed issues on android 15+ white space above keyboard" (#2387)

Author: OS-kepatotorica

keyboard/android/src/main/java/com/capacitorjs/plugins/keyboard/Keyboard.java

@@ -2,9 +2,7 @@
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.os.Build;
 import android.util.DisplayMetrics;
-import android.util.TypedValue;
 import android.view.View;
 import android.view.Window;
 import android.view.inputmethod.InputMethodManager;
@@ -15,7 +13,6 @@
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsAnimationCompat;
 import androidx.core.view.WindowInsetsCompat;
-import com.getcapacitor.Bridge;
 import java.util.List;
 
 public class Keyboard {
@@ -24,7 +21,6 @@ interface KeyboardEventListener {
         void onKeyboardEvent(String event, int size);
     }
 
-    private Bridge bridge;
     private AppCompatActivity activity;
     private View rootView;
     private int usableHeightPrevious;
@@ -43,9 +39,8 @@ public void setKeyboardEventListener(@Nullable KeyboardEventListener keyboardEve
     static final String EVENT_KB_WILL_HIDE = "keyboardWillHide";
     static final String EVENT_KB_DID_HIDE = "keyboardDidHide";
 
-    public Keyboard(Bridge bridge, boolean resizeOnFullScreen) {
-        this.bridge = bridge;
-        this.activity = this.bridge.getActivity();
+    public Keyboard(AppCompatActivity activity, boolean resizeOnFullScreen) {
+        this.activity = activity;
 
         //http://stackoverflow.com/a/4737265/1091751 detect if keyboard is showing
         FrameLayout content = activity.getWindow().getDecorView().findViewById(android.R.id.content);
@@ -136,38 +131,9 @@ private void possiblyResizeChildOfContent(boolean keyboardShown) {
     private int computeUsableHeight() {
         Rect r = new Rect();
         mChildOfContent.getWindowVisibleDisplayFrame(r);
-        if (shouldApplyEdgeToEdgeAdjustments()) {
-            WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(rootView);
-            if (insets != null) {
-                int systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
-                if (systemBars > 0) {
-                    return r.bottom + systemBars;
-                }
-            }
-        }
-
         return isOverlays() ? r.bottom : r.height();
     }
 
-    private boolean shouldApplyEdgeToEdgeAdjustments() {
-        var adjustMarginsForEdgeToEdge = this.bridge.getConfig().adjustMarginsForEdgeToEdge();
-        if (adjustMarginsForEdgeToEdge.equals("force")) { // Force edge-to-edge adjustments regardless of app settings
-            return true;
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && adjustMarginsForEdgeToEdge.equals("auto")) { // Auto means that we need to check the app's edge-to-edge preference
-            TypedValue value = new TypedValue();
-            boolean optOutAttributeExists = activity
-                .getTheme()
-                .resolveAttribute(android.R.attr.windowOptOutEdgeToEdgeEnforcement, value, true);
-
-            if (!optOutAttributeExists) { // Default is to apply edge to edge
-                return true;
-            } else {
-                return value.data == 0;
-            }
-        }
-        return false;
-    }
-
     @SuppressWarnings("deprecation")
     private boolean isOverlays() {
         final Window window = activity.getWindow();

keyboard/android/src/main/java/com/capacitorjs/plugins/keyboard/KeyboardPlugin.java

@@ -18,7 +18,8 @@ public void load() {
         execute(
             () -> {
                 boolean resizeOnFullScreen = getConfig().getBoolean("resizeOnFullScreen", false);
-                implementation = new Keyboard(bridge, resizeOnFullScreen);
+                implementation = new Keyboard(getActivity(), resizeOnFullScreen);
+
                 implementation.setKeyboardEventListener(this::onKeyboardEvent);
             }
         );