commit 5e631477197c54304a2a732f267bb09135015e44
author Vivek Sekhar <vsekhar@codeaurora.org> Mon Mar 31 23:59:10 2014 -0700
committer Vivek Sekhar <vsekhar@codeaurora.org> Tue Apr 01 00:40:04 2014 -0700
tree 1be326b3e4a745783c336cbe17fd8512d72598ce
parent 59d4a3453142e2354024614f5982915912dcefc9

Multiple fixes to browser

- Support dial phone number when input "wtai://wp/mc" scheme in url
- Fix folder creation done button broken in bookmark screen
  when user in landscape mode.

Change-Id: I3978e3ec309c778da6ba214ac556b91585d033ff

src/com/android/browser/AddBookmarkPage.java

diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 73a1ebf..a81b1ba 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -201,7 +201,7 @@
                 }
             }
             // Steal the key press; otherwise a newline will be added
-            return true;
+            // return true;
         }
         return false;
     }

src/com/android/browser/NavigationBarBase.java

diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index 0cf23ee..22655f2 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -176,7 +176,8 @@
             Class[] type = new Class[] {String.class, boolean.class};
             Boolean wap2estore = (Boolean) ReflectHelper.invokeStaticMethod(
                       "android.os.SystemProperties", "getBoolean", type, params);
-            if ((wap2estore && isEstoreTypeUrl(text)) || isRtspTypeUrl(text)) {
+            if ((wap2estore && isEstoreTypeUrl(text)) || isRtspTypeUrl(text)
+                || isMakeCallTypeUrl(text)) {
                 url = text;
             } else {
                 url = UrlUtils.smartUrlFilter(text, false);
@@ -203,6 +204,12 @@
                     return;
                 }
             }
+            // add for "wtai://wp/mc;" scheme feature
+            if (url != null && t != null && isMakeCallTypeUrl(url)) {
+                if (handleMakeCallTypeUrl(url)) {
+                    return;
+                }
+            }
         }
         Intent i = new Intent();
         String action = Intent.ACTION_SEARCH;
@@ -220,6 +227,41 @@
         setDisplayTitle(text);
     }
 
+    private boolean isMakeCallTypeUrl(String url) {
+        String utf8Url = null;
+        try {
+            utf8Url = new String(url.getBytes("UTF-8"), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "err " + e);
+        }
+        if (utf8Url != null && utf8Url.startsWith(UrlHandler.SCHEME_WTAI_MC)) {
+            return true;
+        }
+        return false;
+    }
+
+    private boolean handleMakeCallTypeUrl(String url) {
+        // wtai://wp/mc;number
+        // number=string(phone-number)
+        if (url.startsWith(UrlHandler.SCHEME_WTAI_MC)) {
+            Intent intent = new Intent(Intent.ACTION_VIEW,
+                    Uri.parse(WebView.SCHEME_TEL +
+                    url.substring(UrlHandler.SCHEME_WTAI_MC.length())));
+            getContext().startActivity(intent);
+            // before leaving BrowserActivity, close the empty child tab.
+            // If a new tab is created through JavaScript open to load this
+            // url, we would like to close it as we will load this url in a
+            // different Activity.
+            Tab current = mUiController.getCurrentTab();
+            if (current != null
+                    && current.getWebView().copyBackForwardList().getSize() == 0) {
+                mUiController.closeCurrentTab();
+            }
+            return true;
+        }
+        return false;
+    }
+
     private boolean isEstoreTypeUrl(String url) {
         String utf8Url = null;
         try {