commit 9f1a55b21d05acc91d25fb0ff77089491af68dd8
author Derek Sollenberger <djsollen@google.com> Fri Dec 18 09:56:06 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 18 09:56:06 2009 -0800
tree 33a3e00400ceb8cc66a515a5343180d535cab411
parent 42bf4dc36aa994a3f98c34a6db396ca1b7e7c578
parent 3b2b810a099b7bce65d18fc2a21ae17d78488eb0

am 3b2b810a: Merge change Ife7f3f54 into eclair-mr2

Merge commit '3b2b810a099b7bce65d18fc2a21ae17d78488eb0' into eclair-mr2-plus-aosp

* commit '3b2b810a099b7bce65d18fc2a21ae17d78488eb0':
  Explicitly requesting that the IME resize the WebView.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 938dc27..8a16fbe 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -52,7 +52,8 @@
                   android:launchMode="singleTask"
                   android:alwaysRetainTaskState="true"
                   android:configChanges="orientation|keyboardHidden"
-                  android:theme="@style/BrowserTheme" >
+                  android:theme="@style/BrowserTheme"
+                  android:windowSoftInputMode="adjustResize" >
             <!-- For these schemes were not particular MIME type has been
                  supplied, we are a good candidate. -->
             <intent-filter>