From c13e2213a8f0e35505bdae40c7a69d584635e640 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Mon, 6 Jan 2025 17:05:32 +0200
Subject: [PATCH] Android: remove unused top/left inset params of
 setDisplayMetrics()

Those two params are already marked as unused, so there's no point in
calculating them passing them and then not using them.

Task-number: QTBUG-132716
Change-Id: I840473a42ac4256164252df805b52b859d2fa3de
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
---
 .../qt/android/QtDisplayManager.java          | 27 +++++--------------
 .../qt/android/QtServiceEmbeddedDelegate.java |  4 +--
 .../platforms/android/androidjnimain.cpp      | 11 +++-----
 3 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java b/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java
index b5576972926..247816e7443 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java
@@ -33,10 +33,9 @@ class QtDisplayManager {
 
     // screen methods
     static native void setDisplayMetrics(int screenWidthPixels, int screenHeightPixels,
-                                                int availableLeftPixels, int availableTopPixels,
-                                                int availableWidthPixels, int availableHeightPixels,
-                                                double XDpi, double YDpi, double scaledDensity,
-                                                double density);
+                                         int availableWidthPixels, int availableHeightPixels,
+                                         double XDpi, double YDpi, double scaledDensity,
+                                         double density);
     static native void handleOrientationChanged(int newRotation, int nativeOrientation);
     static native void handleRefreshRateChanged(float refreshRate);
     static native void handleUiDarkModeChanged(int newUiMode);
@@ -277,28 +276,16 @@ class QtDisplayManager {
         if (activity == null)
             return;
 
-        final WindowInsets rootInsets = activity.getWindow().getDecorView().getRootWindowInsets();
-
-        int insetLeft;
-        int insetTop;
-
-        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
-            insetLeft = rootInsets.getStableInsetLeft();
-            insetTop = rootInsets.getStableInsetTop();
-        } else {
-            insetLeft = rootInsets.getInsetsIgnoringVisibility(WindowInsets.Type.systemBars()).left;
-            insetTop = rootInsets.getInsetsIgnoringVisibility(WindowInsets.Type.systemBars()).top;
-        }
-
         final DisplayMetrics displayMetrics = activity.getResources().getDisplayMetrics();
 
         double density = displayMetrics.density;
         double scaledDensity = displayMetrics.scaledDensity;
 
         Size displaySize = getDisplaySize(activity, QtDisplayManager.getDisplay(activity));
-        setDisplayMetrics(displaySize.getWidth(), displaySize.getHeight(), insetLeft, insetTop,
-                width, height, getXDpi(displayMetrics), getYDpi(displayMetrics),
-                scaledDensity, density);
+        setDisplayMetrics(displaySize.getWidth(), displaySize.getHeight(),
+                          width, height,
+                          getXDpi(displayMetrics), getYDpi(displayMetrics),
+                          scaledDensity, density);
     }
 
     static float getXDpi(final DisplayMetrics metrics) {
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtServiceEmbeddedDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtServiceEmbeddedDelegate.java
index adf83368832..c8f79c700b4 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtServiceEmbeddedDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtServiceEmbeddedDelegate.java
@@ -41,11 +41,9 @@ class QtServiceEmbeddedDelegate implements QtEmbeddedViewInterface, QtNative.App
 
                     final int maxWidth = metrics.widthPixels;
                     final int maxHeight = metrics.heightPixels;
-                    final int insetLeft = 0;
-                    final int insetTop = 0;
 
                     QtDisplayManager.setDisplayMetrics(
-                            maxWidth, maxHeight, insetLeft, insetTop, maxWidth, maxHeight,
+                            maxWidth, maxHeight, maxWidth, maxHeight,
                             QtDisplayManager.getXDpi(metrics), QtDisplayManager.getYDpi(metrics),
                             metrics.scaledDensity, metrics.density);
 
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp
index 8919aefe82c..32606b9bc42 100644
--- a/src/plugins/platforms/android/androidjnimain.cpp
+++ b/src/plugins/platforms/android/androidjnimain.cpp
@@ -571,15 +571,12 @@ static void terminateQt(JNIEnv *env, jclass /*clazz*/)
     sem_post(&m_exitSemaphore);
 }
 
-static void setDisplayMetrics(JNIEnv * /*env*/, jclass /*clazz*/, jint screenWidthPixels,
-                              jint screenHeightPixels, jint availableLeftPixels,
-                              jint availableTopPixels, jint availableWidthPixels,
-                              jint availableHeightPixels, jdouble xdpi, jdouble ydpi,
+static void setDisplayMetrics(JNIEnv * /*env*/, jclass /*clazz*/,
+                              jint screenWidthPixels, jint screenHeightPixels,
+                              jint availableWidthPixels, jint availableHeightPixels,
+                              jdouble xdpi, jdouble ydpi,
                               jdouble scaledDensity, jdouble density)
 {
-    Q_UNUSED(availableLeftPixels)
-    Q_UNUSED(availableTopPixels)
-
     m_availableWidthPixels = availableWidthPixels;
     m_availableHeightPixels = availableHeightPixels;
     m_scaledDensity = scaledDensity;