commit 8b54fce3d6c8483d47a055c6abc674ded5c2f01d
author kayiz <kaiyiz@codeaurora.org> Thu Dec 05 10:27:29 2013 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Dec 10 02:35:56 2013 -0800
tree f0a24e8d6279b43c388eab6ae9fb3afd0db27e00
parent 3bf6748233fd4520f489ee0c81660121c08d7a54

Browser: fix issue that the title bar is incorrect

For cmcc test case, display website title in input box
for specified cmcc website, not url address.

CRs-Fixed: 538165

Change-Id: Ia6609c4d3da05a7336f77e50109cf28bea0eb7aa

src/com/android/browser/NavigationBarPhone.java

diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index f3eaa2a..2317658 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -131,7 +131,15 @@
             if (title == null) {
                 mUrlInput.setText(R.string.new_tab);
             } else {
-                mUrlInput.setText(UrlUtils.stripUrl(title), false);
+                Tab tab = mUiController.getTabControl().getCurrentTab();
+                if (tab != null && tab.getUrl() != null &&
+                        tab.getUrl().startsWith("http://218.206.177.209:8080/waptest/browser15")) {
+                    //for cmcc test case, display website title for specified cmcc website,
+                    //not url address.
+                    mUrlInput.setText(tab.getTitle(), false);
+                } else {
+                    mUrlInput.setText(UrlUtils.stripUrl(title), false);
+                }
             }
             mUrlInput.setSelection(0);
         }