From acbcf992ee5b9978f22a76e03384b4d9ea34a76f Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Wed, 9 Apr 2025 12:36:39 +0200 Subject: [PATCH] Android-Keyboard: Remove redundant code in isKeyboardHidden() The m_keyboardIsVisible variable already reflects the current keyboard visibility state. This commit simplifies the isKeyboardHidden() method by using it directly, removing unnecessary logic. Task-number: QTBUG-98984 Pick-to: 6.10 6.9 6.8 Change-Id: I6bba90e6fbfb1191415e7ee812517ca15ac1c937 Reviewed-by: Assam Boudjelthia --- .../src/org/qtproject/qt/android/QtInputDelegate.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/QtInputDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtInputDelegate.java index 1078b700012..92bd62cfdcc 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtInputDelegate.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtInputDelegate.java @@ -119,7 +119,7 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt if (m_keyboardTransitionInProgress == state || m_currentEditText == null) return; - m_keyboardTransitionInProgress= state; + m_keyboardTransitionInProgress = state; ViewTreeObserver observer = m_currentEditText.getViewTreeObserver(); if (state) observer.addOnGlobalLayoutListener(keyboardListener); @@ -321,8 +321,6 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt return true; } - boolean isKeyboardHidden = true; - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) { Rect r = new Rect(); activity.getWindow().getDecorView().getWindowVisibleDisplayFrame(r); @@ -330,13 +328,10 @@ class QtInputDelegate implements QtInputConnection.QtInputConnectionListener, Qt QtDisplayManager.getDisplay(activity).getMetrics(metrics); int screenHeight = metrics.heightPixels; final int kbHeight = screenHeight - r.bottom; - isKeyboardHidden = kbHeight < screenHeight * KEYBOARD_TO_SCREEN_RATIO; - } else { - WindowInsets w = activity.getWindow().getDecorView().getRootWindowInsets(); - isKeyboardHidden = !w.isVisible(Type.ime()); + return kbHeight < screenHeight * KEYBOARD_TO_SCREEN_RATIO; } - return isKeyboardHidden; + return !m_keyboardIsVisible; } @Override