From b1fb70cee9e24f3f9e648dff1816403c427976d1 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Mon, 21 Nov 2011 12:38:14 -0800
Subject: Fix stop/refresh menu state

    Bug: 5469075 5640775

Reconcile page load status updates to only use tab state; update menus
accordingly

Change-Id: Id32f1e0486e8439d6729f3657eda1132c25dfc7e
---
 src/com/android/browser/Tab.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/com/android/browser/Tab.java')

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index dd97960ff..0abc86bdf 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -619,7 +619,6 @@ class Tab implements PictureListener {
                 LogTag.logPageFinishedLoading(
                         url, SystemClock.uptimeMillis() - mLoadStartTime);
             }
-            mInPageLoad = false;
             syncCurrentState(view, url);
             mWebViewController.onPageFinished(Tab.this);
         }
@@ -1044,6 +1043,9 @@ class Tab implements PictureListener {
         @Override
         public void onProgressChanged(WebView view, int newProgress) {
             mPageLoadProgress = newProgress;
+            if (newProgress == 100) {
+                mInPageLoad = false;
+            }
             mWebViewController.onProgressChanged(Tab.this);
         }
 
-- 
cgit v1.2.3