summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2010-01-21 08:39:15 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-21 08:39:15 -0800
commit72666bac20cddba1d2269578c82671fdf5beffc2 (patch)
treeb8101f9dc137d6e6282b890d50d400753e2ead6b /core/java
parent80ffe5d2fe8288623844c8f6c7ba1305d074a852 (diff)
parent1f7747adb6a79317f4bd52fb78b3c567dd203883 (diff)
am 1f7747ad: am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
Merge commit '1f7747adb6a79317f4bd52fb78b3c567dd203883' * commit '1f7747adb6a79317f4bd52fb78b3c567dd203883': Resize the WebView when the soft-keyboard appears in landscape mode.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/WebView.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index db5641c9989b..2d9b52ed3b24 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -55,6 +55,8 @@ import android.view.ViewConfiguration;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.animation.AlphaAnimation;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
import android.webkit.WebTextView.AutoCompleteAdapter;
import android.webkit.WebViewCore.EventHub;
@@ -3206,6 +3208,13 @@ public class WebView extends AbsoluteLayout
mWebViewCore.sendMessage(EventHub.SET_SELECTION, start, end);
}
+ @Override
+ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+ InputConnection connection = super.onCreateInputConnection(outAttrs);
+ outAttrs.imeOptions |= EditorInfo.IME_FLAG_NO_FULLSCREEN;
+ return connection;
+ }
+
/**
* Called in response to a message from webkit telling us that the soft
* keyboard should be launched.