summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2009-12-18 09:59:15 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-18 09:59:15 -0800
commitd6d1fda4d6fa04cc3fd0cf09b879d41a762bab19 (patch)
treea7244822393dde013e9acad874ea57cdd9c4f117 /AndroidManifest.xml
parent357648f457404fec19938f2d0b29a1250c7818cd (diff)
parent9f1a55b21d05acc91d25fb0ff77089491af68dd8 (diff)
downloadpackages_apps_browser-d6d1fda4d6fa04cc3fd0cf09b879d41a762bab19.zip
packages_apps_browser-d6d1fda4d6fa04cc3fd0cf09b879d41a762bab19.tar.gz
packages_apps_browser-d6d1fda4d6fa04cc3fd0cf09b879d41a762bab19.tar.bz2
am 9f1a55b2: am 3b2b810a: Merge change Ife7f3f54 into eclair-mr2
Merge commit '9f1a55b21d05acc91d25fb0ff77089491af68dd8' * commit '9f1a55b21d05acc91d25fb0ff77089491af68dd8': Explicitly requesting that the IME resize the WebView.
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fdf0327..3be62c7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -53,7 +53,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>