Merge "Monkey protection"
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>
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()) {
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();
}
};