Android: remove unused scaled density property

This value is used by nothing throughout the Qt Android code.

Task-number: QTBUG-132716
Change-Id: I694d016131b7eccd9ea5789e77f0501676a7f21a
Reviewed-by: Petri Virkkunen <[email protected]>

4 files changed, 4 insertions, 13 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 247816e7443..61adb44bc4e 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java
@@ -34,7 +34,7 @@ class QtDisplayManager {
     // screen methods
     static native void setDisplayMetrics(int screenWidthPixels, int screenHeightPixels,
                                          int availableWidthPixels, int availableHeightPixels,
-                                         double XDpi, double YDpi, double scaledDensity,
+                                         double XDpi, double YDpi,
                                          double density);
     static native void handleOrientationChanged(int newRotation, int nativeOrientation);
     static native void handleRefreshRateChanged(float refreshRate);
@@ -279,13 +279,12 @@ class QtDisplayManager {
         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(),
                           width, height,
                           getXDpi(displayMetrics), getYDpi(displayMetrics),
-                          scaledDensity, density);
+                          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 c8f79c700b4..a7a88343aa4 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtServiceEmbeddedDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtServiceEmbeddedDelegate.java
@@ -45,7 +45,7 @@ class QtServiceEmbeddedDelegate implements QtEmbeddedViewInterface, QtNative.App
                     QtDisplayManager.setDisplayMetrics(
                             maxWidth, maxHeight, maxWidth, maxHeight,
                             QtDisplayManager.getXDpi(metrics), QtDisplayManager.getYDpi(metrics),
-                            metrics.scaledDensity, metrics.density);
+                            metrics.density);
 
                     QtDisplayManager.updateRefreshRate(m_service);
                 });
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp
index 32606b9bc42..b7cc694d752 100644
--- a/src/plugins/platforms/android/androidjnimain.cpp
+++ b/src/plugins/platforms/android/androidjnimain.cpp
@@ -76,7 +76,6 @@ static QAndroidPlatformIntegration *m_androidPlatformIntegration = nullptr;
 
 static int m_availableWidthPixels  = 0;
 static int m_availableHeightPixels = 0;
-static double m_scaledDensity = 0;
 static double m_density = 1.0;
 
 static AndroidAssetsFileEngineHandler *m_androidAssetsFileEngineHandler = nullptr;
@@ -154,11 +153,6 @@ namespace QtAndroid
         return m_availableHeightPixels;
     }
 
-    double scaledDensity()
-    {
-        return m_scaledDensity;
-    }
-
     double pixelDensity()
     {
         return m_density;
@@ -575,11 +569,10 @@ static void setDisplayMetrics(JNIEnv * /*env*/, jclass /*clazz*/,
                               jint screenWidthPixels, jint screenHeightPixels,
                               jint availableWidthPixels, jint availableHeightPixels,
                               jdouble xdpi, jdouble ydpi,
-                              jdouble scaledDensity, jdouble density)
+                              jdouble density)
 {
     m_availableWidthPixels = availableWidthPixels;
     m_availableHeightPixels = availableHeightPixels;
-    m_scaledDensity = scaledDensity;
     m_density = density;
 
     const QSize screenSize(screenWidthPixels, screenHeightPixels);
diff --git a/src/plugins/platforms/android/androidjnimain.h b/src/plugins/platforms/android/androidjnimain.h
index e625b9e592a..7711bc95112 100644
--- a/src/plugins/platforms/android/androidjnimain.h
+++ b/src/plugins/platforms/android/androidjnimain.h
@@ -43,7 +43,6 @@ namespace QtAndroid
     QWindow *windowFromId(int windowId);
     int availableWidthPixels();
     int availableHeightPixels();
-    double scaledDensity();
     double pixelDensity();
     jobject assets();
     AAssetManager *assetManager();