commit 9bcdcf6d0310b65d6582c72d183edb3e2632f3eb
author John Reck <jreck@google.com> Mon Jul 11 17:17:07 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 11 17:17:07 2011 -0700
tree a610f013204062886f0cc415a4e7ae9e17b02e65
parent c41b6dab84e318722d6949775303eb6edb0fee4d
parent 0f602f3933dcd88702fdb514b6611e3066ca7a2b

Merge "TitleBar refactor"

src/com/android/browser/BrowserSnapshotPage.java

diff --git a/src/com/android/browser/BrowserSnapshotPage.java b/src/com/android/browser/BrowserSnapshotPage.java
index 72da15b..44c419e 100644
--- a/src/com/android/browser/BrowserSnapshotPage.java
+++ b/src/com/android/browser/BrowserSnapshotPage.java
@@ -98,8 +98,10 @@
     public void onDestroyView() {
         super.onDestroyView();
         getLoaderManager().destroyLoader(LOADER_SNAPSHOTS);
-        mAdapter.changeCursor(null);
-        mAdapter = null;
+        if (mAdapter != null) {
+            mAdapter.changeCursor(null);
+            mAdapter = null;
+        }
     }
 
     void setupGrid(LayoutInflater inflater) {

src/com/android/browser/CombinedBookmarkHistoryView.java

diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java
index 184314e..4b3e6d8 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryView.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryView.java
@@ -168,6 +168,10 @@
             public void onAnimationEnd(Animator animation) {
                 super.onAnimationEnd(animation);
                 mIsAnimating = false;
+                if (mActionBar == null) {
+                    // We were destroyed, return
+                    return;
+                }
                 FragmentManager fm = mActivity.getFragmentManager();
                 FragmentTransaction ft = fm.beginTransaction();
                 onTabSelected(mActionBar.getSelectedTab(), ft);