commit 6fc7369f6baa466f15d86b68f07fab154bd82ae3
author Axesh  R. Ajmera <aajmera@codeaurora.org> Tue Aug 11 16:32:10 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:47 2015 +0200
tree 89edc0139c35127a25bf65d84455d58f2edc5349
parent 5446406f556a849c3fb395f43de386fe38316bf0

Revert "Add support for "browser:" protocol"

This reverts commit c0272db15121ba10229bf9de6a4200f5e6e4c518.

Change-Id: I4395d4f85f7e80e53ce9e8bfa43abcf25f34c636

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 230e49f..c3befc8 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -132,7 +132,7 @@
     private static final String LOGTAG = "Controller";
     private static final String SEND_APP_ID_EXTRA =
         "android.speech.extras.SEND_APPLICATION_ID_EXTRA";
-    public static final String INCOGNITO_URI = "browser://incognito";
+    private static final String INCOGNITO_URI = "chrome://incognito";
     public static final String EXTRA_REQUEST_CODE = "_fake_request_code_";
     public static final String EXTRA_RESULT_CODE = "_fake_result_code_";
 

src/com/android/browser/NavigationBarBase.java

diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index 9087991..fd8869d 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -95,7 +95,7 @@
     protected int mTrustLevel = SiteTileView.TRUST_UNKNOWN;
 
     private static final String noSitePrefs[] = {
-            "browser://",
+            "chrome://",
             "about:",
             "content:",
     };
@@ -513,7 +513,7 @@
             Tab t = mBaseUi.getActiveTab();
             // Only shortcut javascript URIs for now, as there is special
             // logic in UrlHandler for other schemas
-            if (url != null && t != null &&  url.startsWith("javascript:")) {
+            if (url != null && t != null && url.startsWith("javascript:")) {
                 mUiController.loadUrl(t, url);
                 setDisplayTitle(null, text);
                 return;

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index e18cb2a..a65fda5 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -229,7 +229,7 @@
         PageState(Context c, boolean incognito) {
             mIncognito = incognito;
             if (mIncognito) {
-                mOriginalUrl = mUrl = Controller.INCOGNITO_URI;
+                mOriginalUrl = mUrl = "chrome://incognito";
                 mTitle = c.getString(R.string.new_incognito_tab);
             } else {
                 mOriginalUrl = mUrl = "";
@@ -506,12 +506,7 @@
         public WebResourceResponse shouldInterceptRequest(WebView view,
                 String url) {
             //intercept if opening a new incognito tab - show the incognito welcome page
-
-            // show only incognito content and webview has private
-            // and cannot go back(only supported if explicit from UI )
-            if (view.isPrivateBrowsingEnabled() &&
-                !view.canGoBack() &&
-                url.startsWith(Controller.INCOGNITO_URI) ) {
+            if (url.startsWith("chrome://incognito")) {
                 Resources resourceHandle = mContext.getResources();
                 InputStream inStream = resourceHandle.openRawResource(
                         com.android.browser.R.raw.incognito_mode_start_page);

src/com/android/browser/UrlUtils.java

diff --git a/src/com/android/browser/UrlUtils.java b/src/com/android/browser/UrlUtils.java
index e5fd17e..4d3dee4 100755
--- a/src/com/android/browser/UrlUtils.java
+++ b/src/com/android/browser/UrlUtils.java
@@ -47,7 +47,7 @@
     static final Pattern ACCEPTED_URI_SCHEMA = Pattern.compile(
             "(?i)" + // switch on case insensitive matching
             "(" +    // begin group for schema
-            "(?:http|https|file|browser):\\/\\/" +
+            "(?:http|https|file|chrome):\\/\\/" +
             "|(?:inline|data|about|javascript):" +
             ")" +
             "(.*)" );
@@ -206,7 +206,8 @@
         if (inUrl == null) {
             return "";
         }
-        if (inUrl.startsWith("content:")) {
+        if (inUrl.startsWith("content:")
+                || inUrl.startsWith("browser:")) {
             return "";
         }
         return inUrl;

src/com/android/browser/preferences/LegalPreferencesFragment.java

diff --git a/src/com/android/browser/preferences/LegalPreferencesFragment.java b/src/com/android/browser/preferences/LegalPreferencesFragment.java
index 23b4163..ce75630 100644
--- a/src/com/android/browser/preferences/LegalPreferencesFragment.java
+++ b/src/com/android/browser/preferences/LegalPreferencesFragment.java
@@ -48,7 +48,6 @@
 public class LegalPreferencesFragment extends PreferenceFragment
                             implements OnPreferenceClickListener {
 
-    private static final String creditsUrl = "browser://credits";
     PreferenceScreen mHeadPref = null;
     String mEulaUrl = "";
     String mPrivacyPolicyUrl = "";
@@ -102,7 +101,8 @@
         Bundle b = new Bundle();
         if(preference.getKey().equals(PreferenceKeys.PREF_LEGAL_CREDITS)) {
             Intent i = new Intent(getActivity(), LegalPreviewActivity.class);
-            i.putExtra(LegalPreviewActivity.URL_INTENT_EXTRA, creditsUrl);
+            i.putExtra(LegalPreviewActivity.URL_INTENT_EXTRA, getResources()
+                    .getString(R.string.swe_open_source_license_url));
             startActivity(i);
             return true;
         } else if(preference.getKey().equals(PreferenceKeys.PREF_LEGAL_EULA)) {