commit 91911a26058418e622950cffc616f99ada49df1d
author Michael Kolb <kolby@google.com> Tue Jan 17 11:21:25 2012 -0800
committer Michael Kolb <kolby@google.com> Tue Jan 17 12:36:22 2012 -0800
tree a5e3b260f8e8c80640e20c29f2425ca185c3774c
parent 0755fcde2dfef68344188a02d16745f516547c69

fix back key on tabs behavior

    Bug: 5851422 5841282

don't restore back/forward list when re-creating a webview

Change-Id: I4648ced38aafedb8e129f599f0ea28f7520da9b8

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index a7598c2..b09e423 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -1501,11 +1501,15 @@
         return mId;
     }
 
+    void setWebView(WebView w) {
+        setWebView(w, true);
+    }
+
     /**
      * Sets the WebView for this tab, correctly removing the old WebView from
      * the container view.
      */
-    void setWebView(WebView w) {
+    void setWebView(WebView w, boolean restore) {
         if (mMainView == w) {
             return;
         }
@@ -1542,7 +1546,7 @@
             if (tc != null && tc.getOnThumbnailUpdatedListener() != null) {
                 mMainView.setPictureListener(this);
             }
-            if (mSavedState != null) {
+            if (restore && (mSavedState != null)) {
                 WebBackForwardList restoredState
                         = mMainView.restoreState(mSavedState);
                 if (restoredState == null || restoredState.getSize() == 0) {