Implement ComboView for Bookmarks, History and SavedPages
- Replaces ComboViewActivity for PhoneUi.
- Lives as part of the BrowserActivity's ViewTree.
- Avoids construction of ComboViewActivity everytime the bookmarks screen is opened.
Change-Id: Ic7042de731a4cc2107a297c9f7d4356bc2c30f2e
diff --git a/src/com/android/browser/BrowserSnapshotPage.java b/src/com/android/browser/BrowserSnapshotPage.java
index 5d2453b..e2194d1 100644
--- a/src/com/android/browser/BrowserSnapshotPage.java
+++ b/src/com/android/browser/BrowserSnapshotPage.java
@@ -85,7 +85,14 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- mCallback = (CombinedBookmarksCallbacks) getActivity();
+ if (mCallback == null && getActivity() instanceof CombinedBookmarksCallbacks) {
+ mCallback = (CombinedBookmarksCallbacks) getActivity();
+ } else {
+ View cb = getActivity().getWindow().getDecorView().findViewById(R.id.combo_view_container);
+ if (cb != null && cb instanceof CombinedBookmarksCallbacks) {
+ mCallback = (CombinedBookmarksCallbacks) cb;
+ }
+ }
mAnimateId = getArguments().getLong(EXTRA_ANIMATE_ID);
}