Revert "hide the input method window when the user is done typing"

Reverting r248903.

This is causing keyboard to be erroneously dismissed. See
https://code.google.com/p/chromium/issues/detail?id=340100#c14

BUG=340100

Review URL: https://codereview.chromium.org/197763002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256750 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 42 deletions

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 d6afdea..95f2bbf 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
@@ -226,13 +226,6 @@ public class AdapterInputConnection extends BaseInputConnection {
             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 @@ public class AdapterInputConnectionTest extends ContentShellTestBase {
         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 @@ public class AdapterInputConnectionTest extends ContentShellTestBase {
 
     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 class AdapterInputConnectionTest extends ContentShellTestBase {
         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 @@ public class AdapterInputConnectionTest extends ContentShellTestBase {
         @Override
         public boolean hideSoftInputFromWindow(IBinder windowToken, int flags,
                 ResultReceiver resultReceiver) {
-            hidden = true;
             return true;
         }
 
@@ -157,10 +127,6 @@ public class AdapterInputConnectionTest extends ContentShellTestBase {
                     state.compositionStart);
             assertEquals("Composition end did not match", compositionEnd, state.compositionEnd);
         }
-
-        public boolean isHidden() {
-            return hidden;
-        }
     }
 
     private static class TestImeAdapterDelegate implements ImeAdapterDelegate {