Merge "Prevent IME from popping up on startup"

Author: Michael Kolb

core/java/android/webkit/WebView.java

@@ -422,7 +422,7 @@ public boolean deleteSurroundingText(int leftLength, int rightLength) {
     private final Rect mViewRectViewport = new Rect();
     private final RectF mVisibleContentRect = new RectF();
     private boolean mGLViewportEmpty = false;
-    WebViewInputConnection mInputConnection = new WebViewInputConnection();
+    WebViewInputConnection mInputConnection = null;
 
 
     /**
@@ -4941,16 +4941,14 @@ WebViewCore.CursorData cursorDataNoPosition() {
         }
     }
 
-    @Override
-    public boolean onCheckIsTextEditor() {
-        return true;
-    }
-
     @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
         outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_FULLSCREEN
                 | EditorInfo.TYPE_CLASS_TEXT
                 | EditorInfo.TYPE_TEXT_VARIATION_NORMAL;
+        if (mInputConnection == null) {
+            mInputConnection = new WebViewInputConnection();
+        }
         return mInputConnection;
     }