summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-07-08 13:48:03 -0700
committerJohn Reck <jreck@google.com>2011-07-08 13:48:03 -0700
commitc994b5d66cc0c5f0b52f52caa49c51d7fec9b186 (patch)
tree9e02b888cdf913baefea0c91d55b34a33556ee00 /src/com
parent15bdd87d767fc105f53e74a83e71967a80b78f89 (diff)
downloadpackages_apps_Browser-c994b5d66cc0c5f0b52f52caa49c51d7fec9b186.zip
packages_apps_Browser-c994b5d66cc0c5f0b52f52caa49c51d7fec9b186.tar.gz
packages_apps_Browser-c994b5d66cc0c5f0b52f52caa49c51d7fec9b186.tar.bz2
Fix toggling about:debug not working
Problem was caused by shortcutting the TYPED url scenario. For now, only shortcut javascript: urls Change-Id: Ia89f6cadda42c29522ab61b1e82fa0129d3c4849
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/browser/TitleBarBase.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/browser/TitleBarBase.java b/src/com/android/browser/TitleBarBase.java
index de44306..17b9e19 100644
--- a/src/com/android/browser/TitleBarBase.java
+++ b/src/com/android/browser/TitleBarBase.java
@@ -548,7 +548,9 @@ public class TitleBarBase extends RelativeLayout
if (UrlInputView.TYPED.equals(source)) {
String url = UrlUtils.smartUrlFilter(text, false);
Tab t = mBaseUi.getActiveTab();
- if (url != null && t != null) {
+ // Only shortcut javascript URIs for now, as there is special
+ // logic in UrlHandler for other schemas
+ if (url != null && t != null && url.startsWith("javascript:")) {
mUiController.loadUrl(t, url);
setDisplayTitle(text);
return;