summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivek Sekhar <vsekhar@codeaurora.org>2014-11-25 15:34:35 -0800
committerVivek Sekhar <vsekhar@codeaurora.org>2014-11-25 15:34:35 -0800
commit361065a73263ffef792d0cba10d8ad22434b327c (patch)
tree27846581d57ff1f356ca657ea9ea4562139b1617
parent56cba97cfd96c760a65a6018a2c4adadfef1b271 (diff)
downloadandroid_packages_apps_Gello-361065a73263ffef792d0cba10d8ad22434b327c.tar.gz
android_packages_apps_Gello-361065a73263ffef792d0cba10d8ad22434b327c.tar.bz2
android_packages_apps_Gello-361065a73263ffef792d0cba10d8ad22434b327c.zip
Fixes to most visited page
- Do not call reload when toggling the UserAgent. - Ensure that original URL of WebView is used when updating the most visited entries. Change-Id: Ic7026a125d1bdccd0a0d47dbad7daebea2131d28
-rw-r--r--src/com/android/browser/Controller.java1
-rw-r--r--src/com/android/browser/Tab.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 2bd09ba5..292a46db 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2143,7 +2143,6 @@ public class Controller
public void toggleUserAgent() {
WebView web = getCurrentWebView();
mSettings.toggleDesktopUseragent(web);
- web.reload();
}
@Override
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 0a6c83d6..99644137 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -1798,6 +1798,8 @@ class Tab implements PictureListener {
}
String getOriginalUrl() {
+ if (mMainView != null)
+ return mMainView.getOriginalUrl();
if (mCurrentState.mOriginalUrl == null) {
return getUrl();
}