Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into tqtc/lts-5.15-opensource

Change-Id: Ia9164a17d80376f0a3ab9752c4a9f4dd2f0bd3d9

1 files changed, 5 insertions, 3 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtLayout.java b/src/android/jar/src/org/qtproject/qt5/android/QtLayout.java
index 45b5c0b061..e94ce60248 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtLayout.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtLayout.java
@@ -77,14 +77,16 @@ public class QtLayout extends ViewGroup
         Rect r = new Rect();
         ((Activity) getContext()).getWindow().getDecorView().getWindowVisibleDisplayFrame(r);
 
-        if (m_bottomDisplayFrame !=  r.bottom) {
+        if (m_bottomDisplayFrame !=  r.bottom || oldh == -1) {
             m_bottomDisplayFrame =  r.bottom;
             QtNative.setApplicationDisplayMetrics(metrics.widthPixels, metrics.heightPixels, w, h,
                                                 metrics.xdpi,
                                                 metrics.ydpi,
                                                 metrics.scaledDensity,
                                                 metrics.density,
-                                                ((metrics.heightPixels == h) || (metrics.heightPixels == h + r.top)));
+                                               ((metrics.heightPixels == h)
+                                               || (metrics.heightPixels == h + r.top)
+                                               || (m_bottomDisplayFrame > metrics.heightPixels + r.top)));
         }
     }
 
@@ -171,7 +173,7 @@ public class QtLayout extends ViewGroup
             }
         }
 
-        handleSizeChanged (r, b, 0, 0);
+         handleSizeChanged (r, b, 0, -1);
     }
 
     // Override to allow type-checking of LayoutParams.