diff options
| author | Leon Scroggins III <scroggo@google.com> | 2010-09-02 13:10:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-02 13:10:30 -0700 |
| commit | 63662480178f46a1aaa32ab2ce33e2fc384a6fa5 (patch) | |
| tree | 892332b39e4fb5c1f2814436e09e3d2538471be9 /core | |
| parent | 6874bd0becf57649c1aaf6e9e73c66d4f05873b9 (diff) | |
| parent | 71d17e40714407296d0d8c83d35c20f591bb0386 (diff) | |
| download | frameworks_base-63662480178f46a1aaa32ab2ce33e2fc384a6fa5.zip frameworks_base-63662480178f46a1aaa32ab2ce33e2fc384a6fa5.tar.gz frameworks_base-63662480178f46a1aaa32ab2ce33e2fc384a6fa5.tar.bz2 | |
Merge "Only close the IME if it is Active on the WebView."
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebTextView.java | 6 | ||||
| -rw-r--r-- | core/java/android/webkit/WebView.java | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java index 990f891..4d85046 100644 --- a/core/java/android/webkit/WebTextView.java +++ b/core/java/android/webkit/WebTextView.java @@ -594,8 +594,10 @@ import java.util.ArrayList; */ /* package */ void remove() { // hide the soft keyboard when the edit text is out of focus - InputMethodManager.getInstance(mContext).hideSoftInputFromWindow( - getWindowToken(), 0); + InputMethodManager imm = InputMethodManager.getInstance(mContext); + if (imm.isActive(this)) { + imm.hideSoftInputFromWindow(getWindowToken(), 0); + } mWebView.removeView(this); mWebView.requestFocus(); } diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 0b236af..b83edc7 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -3701,8 +3701,10 @@ public class WebView extends AbsoluteLayout private void hideSoftKeyboard() { InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE); - - imm.hideSoftInputFromWindow(this.getWindowToken(), 0); + if (imm.isActive(this) + || (inEditingMode() && imm.isActive(mWebTextView))) { + imm.hideSoftInputFromWindow(this.getWindowToken(), 0); + } } /* |