diff options
| author | Michael Kolb <kolby@google.com> | 2012-01-18 14:00:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-18 14:00:52 -0800 |
| commit | d9fdd9fd7862b0d56094fa9846fb7c730ec305a8 (patch) | |
| tree | da16bda1d81bf893e87026a2eec886bc2057fb58 /core | |
| parent | ca917ac1e6d2cca9f3a673d8453621ddc4e6602b (diff) | |
| parent | 17146c7cc007c21b3ec36f8dec76aded15e7a53f (diff) | |
| download | frameworks_base-d9fdd9fd7862b0d56094fa9846fb7c730ec305a8.zip frameworks_base-d9fdd9fd7862b0d56094fa9846fb7c730ec305a8.tar.gz frameworks_base-d9fdd9fd7862b0d56094fa9846fb7c730ec305a8.tar.bz2 | |
Merge "Prevent IME from popping up on startup"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index e6fc3d6..69c15a6 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -422,7 +422,7 @@ public class WebView extends AbsoluteLayout private final Rect mViewRectViewport = new Rect(); private final RectF mVisibleContentRect = new RectF(); private boolean mGLViewportEmpty = false; - WebViewInputConnection mInputConnection = new WebViewInputConnection(); + WebViewInputConnection mInputConnection = null; /** @@ -4942,15 +4942,13 @@ public class WebView extends AbsoluteLayout } @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; } |