summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-12-16 13:45:22 -0800
committerMichael Kolb <kolby@google.com>2011-12-16 13:45:22 -0800
commitdcd90e3a0607d8634733dd1971d72f3265732b47 (patch)
tree30ee40ec5396743e1ee0c7e89fa8bea7871d9730 /src
parent7ac63b64e9f127057f93b12fb65400c5a6dee7c4 (diff)
downloadpackages_apps_Browser-dcd90e3a0607d8634733dd1971d72f3265732b47.zip
packages_apps_Browser-dcd90e3a0607d8634733dd1971d72f3265732b47.tar.gz
packages_apps_Browser-dcd90e3a0607d8634733dd1971d72f3265732b47.tar.bz2
fix anchor link url bar updates
Bug: 5621026 Allow onPageFinished to reach Controller for links with anchor tags Note that the bookmark thumbnail update won't overload the async task anymore, since only one update message is active at any given time (see bug: 4517571) Change-Id: Iaeb9950ef15446aa9c824c7196f26a748591c944
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/Controller.java4
-rw-r--r--src/com/android/browser/Tab.java5
2 files changed, 2 insertions, 7 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 01e090b..67be22e 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -842,7 +842,8 @@ public class Controller
mUi.onTabDataChanged(tab);
if (!tab.isPrivateBrowsingEnabled()
&& !TextUtils.isEmpty(tab.getUrl())
- && !tab.isSnapshot()) {
+ && !tab.isSnapshot()
+ && !tab.inPageLoad()) {
// Only update the bookmark screenshot if the user did not
// cancel the load early and there is not already
// a pending update for the tab.
@@ -2011,7 +2012,6 @@ public class Controller
}
final String url = tab.getUrl();
final String originalUrl = view.getOriginalUrl();
-
if (TextUtils.isEmpty(url)) {
return;
}
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 0abc86b..a7598c2 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -610,11 +610,6 @@ class Tab implements PictureListener {
@Override
public void onPageFinished(WebView view, String url) {
- if (!mInPageLoad) {
- // In page navigation links (www.something.com#footer) will
- // trigger an onPageFinished which we don't care about.
- return;
- }
if (!isPrivateBrowsingEnabled()) {
LogTag.logPageFinishedLoading(
url, SystemClock.uptimeMillis() - mLoadStartTime);