Cherry pick: Revert "hide the input method window when the user is done typing"
Upstream bug description:
BUG=340100
Review URL: https://codereview.chromium.org/197763002
Committed:
https://src.chromium.org/viewvc/chrome?view=rev&revision=256750
BUG: b/11157219
Change-Id: I544a36717b8dcdf715d2ab7c3de20ae0d788c1fa
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/AdapterInputConnection.java b/content/public/android/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
index 369d5ed..05d04c1 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/AdapterInputConnection.java
@@ -225,13 +225,6 @@
mImeAdapter.sendKeyEventWithKeyCode(KeyEvent.KEYCODE_ENTER,
KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE
| KeyEvent.FLAG_EDITOR_ACTION);
-
- if ((actionCode == EditorInfo.IME_ACTION_GO || actionCode == EditorInfo.IME_ACTION_DONE
- || actionCode == EditorInfo.IME_ACTION_SEARCH) && isActive()) {
- // User is done typing, hide the keyboard.
- InputMethodManagerWrapper wrapper = getInputMethodManagerWrapper();
- wrapper.hideSoftInputFromWindow(mInternalView.getWindowToken(), 0, null);
- }
}
return true;
}
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
index 9321bc5..9dcce92 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java
@@ -78,32 +78,6 @@
mWrapper.verifyUpdateSelectionCall(0, 4, 4, 0 ,4);
}
- @MediumTest
- @Feature({"TextInput", "Main"})
- public void testDismissInputMethodWindowAfterFinishingTyping() throws Throwable {
- assertEquals(false, mWrapper.isHidden());
-
- mConnection.performEditorAction(EditorInfo.IME_ACTION_NEXT);
- assertEquals(false, mWrapper.isHidden());
- mWrapper.showSoftInput(null, 0, null);
-
- mConnection.performEditorAction(EditorInfo.IME_ACTION_SEND);
- assertEquals(false, mWrapper.isHidden());
- mWrapper.showSoftInput(null, 0, null);
-
- mConnection.performEditorAction(EditorInfo.IME_ACTION_GO);
- assertEquals(true, mWrapper.isHidden());
- mWrapper.showSoftInput(null, 0, null);
-
- mConnection.performEditorAction(EditorInfo.IME_ACTION_DONE);
- assertEquals(true, mWrapper.isHidden());
- mWrapper.showSoftInput(null, 0, null);
-
- mConnection.performEditorAction(EditorInfo.IME_ACTION_SEARCH);
- assertEquals(true, mWrapper.isHidden());
- mWrapper.showSoftInput(null, 0, null);
- }
-
private static class TestImeAdapter extends ImeAdapter {
public TestImeAdapter(InputMethodManagerWrapper wrapper, ImeAdapterDelegate embedder) {
super(wrapper, embedder);
@@ -112,7 +86,6 @@
private static class TestInputMethodManagerWrapper extends InputMethodManagerWrapper {
private final ArrayList<ImeState> mUpdates = new ArrayList<ImeState>();
- private boolean hidden = false;
public TestInputMethodManagerWrapper(Context context) {
super(context);
@@ -122,9 +95,7 @@
public void restartInput(View view) {}
@Override
- public void showSoftInput(View view, int flags, ResultReceiver resultReceiver) {
- hidden = false;
- }
+ public void showSoftInput(View view, int flags, ResultReceiver resultReceiver) {}
@Override
public boolean isActive(View view) {
@@ -134,7 +105,6 @@
@Override
public boolean hideSoftInputFromWindow(IBinder windowToken, int flags,
ResultReceiver resultReceiver) {
- hidden = true;
return true;
}
@@ -157,10 +127,6 @@
state.compositionStart);
assertEquals("Composition end did not match", compositionEnd, state.compositionEnd);
}
-
- public boolean isHidden() {
- return hidden;
- }
}
private static class TestImeAdapterDelegate implements ImeAdapterDelegate {
