commit 9754b4311b58e24899b9c5c09a3a760a0fd9db81
author John Reck <jreck@google.com> Tue Sep 06 16:54:34 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 06 16:54:34 2011 -0700
tree b628546251351b0490cdab068700449347b2e5ee
parent 534dfa4b8aeae881a24b3d5dfa6927f15bb37b29
parent a60fffaa18e26b29880c7ce21548af4f8ec0e443

Merge "Monkey protection"

AndroidManifest.xml

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" />

res/layout/browser_add_bookmark.xml

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>

src/com/android/browser/BrowserBookmarksPage.java

diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index bf96597..e2447e8 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -393,6 +393,7 @@
     public void onDestroyView() {
         super.onDestroyView();
         mGrid.setBreadcrumbController(null);
+        mGrid.clearAccounts();
         LoaderManager lm = getLoaderManager();
         lm.destroyLoader(LOADER_ACCOUNTS);
         for (int id : mBookmarkAdapters.keySet()) {

src/com/android/browser/view/BookmarkExpandableView.java

diff --git a/src/com/android/browser/view/BookmarkExpandableView.java b/src/com/android/browser/view/BookmarkExpandableView.java
index edc497b..44a123a 100644
--- a/src/com/android/browser/view/BookmarkExpandableView.java
+++ b/src/com/android/browser/view/BookmarkExpandableView.java
@@ -345,7 +345,7 @@
 
             @Override
             public void onInvalidated() {
-                notifyDataSetChanged();
+                notifyDataSetInvalidated();
             }
         };