diff options
| author | John Reck <jreck@google.com> | 2011-09-06 16:53:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-06 16:53:44 -0700 |
| commit | 19a6f07a79d50c8a52013d77cf7929a3f98191e6 (patch) | |
| tree | eb5bb8cb0ffebb2470856af32278d26320e9c613 | |
| parent | 4b97ed9959dfffc95a035f28430426b15a5a8957 (diff) | |
| parent | aec19cee95294e3ddfae1cb549f852b1e9bdac4b (diff) | |
| download | packages_apps_Browser-19a6f07a79d50c8a52013d77cf7929a3f98191e6.zip packages_apps_Browser-19a6f07a79d50c8a52013d77cf7929a3f98191e6.tar.gz packages_apps_Browser-19a6f07a79d50c8a52013d77cf7929a3f98191e6.tar.bz2 | |
Merge "Support scrolling in add bookmark dialog"
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | res/layout/browser_add_bookmark.xml | 17 |
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> |