From 434e9f83e13c0758dcdefe214357fc9cc9f104d5 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 10 Aug 2011 18:16:52 -0700
Subject: Strip http://(www.)? from url input

 Bug: 4982126

Change-Id: Ia8a9ade2ad4f578e40333f42e02edc161f7fa1c2
---
 src/com/android/browser/NavigationBarPhone.java | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'src/com/android/browser/NavigationBarPhone.java')

diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index 817337718..49228db72 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -128,11 +128,12 @@ public class NavigationBarPhone extends NavigationBarBase implements
      */
     @Override
     void setDisplayTitle(String title) {
+        mUrlInput.setTag(title);
         if (!isEditingUrl()) {
             if (title == null) {
                 mUrlInput.setText(R.string.new_tab);
             } else {
-                mUrlInput.setText(title);
+                mUrlInput.setText(UrlUtils.stripUrl(title), false);
             }
             mUrlInput.setSelection(0);
         }
@@ -197,6 +198,18 @@ public class NavigationBarPhone extends NavigationBarBase implements
         mBaseUi.showTitleBarForDuration();
     }
 
+    @Override
+    public void onFocusChange(View view, boolean hasFocus) {
+        if (view == mUrlInput) {
+            if (hasFocus) {
+                mUrlInput.setText((String) mUrlInput.getTag(), false);
+            } else {
+                setDisplayTitle(mUrlInput.getText().toString());
+            }
+        }
+        super.onFocusChange(view, hasFocus);
+    }
+
     @Override
     public void onStateChanged(int state) {
         switch(state) {
-- 
cgit v1.2.3