summaryrefslogtreecommitdiffstats
path: root/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
diff options
context:
space:
mode:
authorRami Potinkara <rami.potinkara@qt.io>2021-10-15 05:52:44 +0000
committerRami Potinkara <rami.potinkara@qt.io>2021-10-26 20:46:24 +0000
commitb1820295e1e8f04634cf9c008a2473d9e2889288 (patch)
tree1fd60951862a7479a73f225eb5a92a79c9c24b84 /src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
parent323b97ccaea7b9442fa1bcb01514e0c5a4a97fdc (diff)
Revert "Android: Place cursor correctly on screen when editing"
This reverts commit 5c6b10c3cee5737dbc041d0463220898c8120807. It caused a regression such that the main window no longer resized or panned when the VKB is shown, in spite of android:windowSoftInputMode being set. Pick-to: 6.2 5.15 Task-number: QTBUG-95300 Task-number: QTBUG-96117 Task-number: QTBUG-97503 Change-Id: If56e1113eea69a940f6760bdb2ad06a93a0759c1 Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java')
-rw-r--r--src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
index 3d233f1c90..9bfa8738b6 100644
--- a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
@@ -1090,11 +1090,6 @@ public class QtActivity extends Activity
QtNative.activityDelegate().resetSoftwareKeyboard();
}
- public void updateInputItemRectangle(final int x, final int y, final int w, final int h)
- {
- QtNative.activityDelegate().updateInputItemRectangle(x, y, w, h);
- }
-
public boolean setKeyboardVisibility(boolean visibility, long timeStamp)
{
return QtNative.activityDelegate().setKeyboardVisibility(visibility, timeStamp);
@@ -1111,10 +1106,10 @@ public class QtActivity extends Activity
}
public void showSoftwareKeyboard(final int x, final int y, final int width,
- final int height, final int editorHeight,
- final int inputHints, final int enterKeyType)
+ final int height, final int inputHints,
+ final int enterKeyType)
{
- QtNative.activityDelegate().showSoftwareKeyboard(x, y, width, height, editorHeight, inputHints, enterKeyType);
+ QtNative.activityDelegate().showSoftwareKeyboard(x, y, width, height, inputHints, enterKeyType);
}
public boolean startApplication()