Show keyboard on mouse event. Focus change listener should be respons…

…ible for hiding the keyboard only.
openjdk · Jun 25, 2020 · 0aa7902 · 0aa7902
1 parent 3024ddc
commit 0aa7902
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/modules/javafx.controls/src/android/java/javafx/scene/control/skin/TextAreaSkinAndroid.java b/modules/javafx.controls/src/android/java/javafx/scene/control/skin/TextAreaSkinAndroid.java
@@ -46,12 +46,8 @@ public class TextAreaSkinAndroid extends TextAreaSkin {
     };
 
     private final ChangeListener<Boolean> focusChangeListener = (observable, wasFocused, isFocused) -> {
-        if (getSkinnable().isEditable()) {
-            if (isFocused) {
-                showSoftwareKeyboard();
-            } else {
-                hideSoftwareKeyboard();
-            }
+        if (wasFocused && !isFocused) {
+            hideSoftwareKeyboard();
         }
     };
     private final WeakChangeListener<Boolean> weakFocusChangeListener = new WeakChangeListener<>(focusChangeListener);

diff --git a/modules/javafx.controls/src/android/java/javafx/scene/control/skin/TextFieldSkinAndroid.java b/modules/javafx.controls/src/android/java/javafx/scene/control/skin/TextFieldSkinAndroid.java
@@ -46,12 +46,8 @@ public class TextFieldSkinAndroid extends TextFieldSkin {
     };
 
     private final ChangeListener<Boolean> focusChangeListener = (observable, wasFocused, isFocused) -> {
-        if (getSkinnable().isEditable()) {
-            if (isFocused) {
-                showSoftwareKeyboard();
-            } else {
-                hideSoftwareKeyboard();
-            }
+        if (wasFocused && !isFocused) {
+            hideSoftwareKeyboard();
         }
     };
     private final WeakChangeListener<Boolean> weakFocusChangeListener = new WeakChangeListener<>(focusChangeListener);