summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-09-06 15:55:22 -0700
committerJohn Reck <jreck@google.com>2011-09-06 15:55:22 -0700
commitaec19cee95294e3ddfae1cb549f852b1e9bdac4b (patch)
tree720e94254fb39aec2fad70552348742f52295f11
parent6d3975f136ea15fa4390edccaa78b95adf1b85d9 (diff)
downloadpackages_apps_Browser-aec19cee95294e3ddfae1cb549f852b1e9bdac4b.zip
packages_apps_Browser-aec19cee95294e3ddfae1cb549f852b1e9bdac4b.tar.gz
packages_apps_Browser-aec19cee95294e3ddfae1cb549f852b1e9bdac4b.tar.bz2
Support scrolling in add bookmark dialog
Bug: 5262349 Change-Id: I7d15f9de812848f3bff82804421ce878ee7f9beb
-rw-r--r--AndroidManifest.xml3
-rw-r--r--res/layout/browser_add_bookmark.xml17
2 files changed, 12 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ae84d79..60a9336 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -182,8 +182,7 @@
<activity android:name="AddBookmarkPage" android:label="Save bookmark"
android:theme="@style/DialogWhenLarge"
- android:configChanges="orientation|keyboardHidden|screenSize"
- android:windowSoftInputMode="stateHidden|adjustPan">
+ android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.INSERT" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/res/layout/browser_add_bookmark.xml b/res/layout/browser_add_bookmark.xml
index 3720790..4b84ff2 100644
--- a/res/layout/browser_add_bookmark.xml
+++ b/res/layout/browser_add_bookmark.xml
@@ -14,11 +14,16 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- >
- <include layout="@layout/browser_add_bookmark_content" />
+ android:layout_height="match_parent">
-</LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ >
+ <include layout="@layout/browser_add_bookmark_content" />
+
+ </LinearLayout>
+</ScrollView>