commit b2ba52bf182bf9e38f4a2367a7e137a1c4b4022a
author Michael Kolb <kolby@google.com> Fri Jan 28 13:48:50 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 28 13:48:50 2011 -0800
tree a891a6e0e650a1a8d051da36f2ef7b3255bb05f2
parent 87a44887f87c9a9f9e1d38d45a6798721140dea9
parent 47171d85e40b3d89e347f950d157036f6b0c1d8d

Merge "fix focus handling in url input" into honeycomb

res/layout/url_bar.xml

diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index f8eb03b..526e44c 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -76,7 +76,6 @@
                 android:layout_width="0dip"
                 android:layout_weight="1.0"
                 android:layout_height="match_parent"
-                android:layout_marginTop="12dip"
                 android:layout_marginLeft="16dip"
                 android:paddingLeft="0dip"
                 android:paddingRight="0dip"

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 3131ba7..472201b 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2125,9 +2125,10 @@
         if (mTabControl.canCreateNewTab()) {
             Tab currentTab = mTabControl.getCurrentTab();
             Tab tab = mTabControl.createNewTab(false, null,
-                    "browser:incognito", true);
+                    null, true);
             addTab(tab);
             setActiveTab(tab);
+            loadUrlDataIn(tab, new UrlData("browser:incognito"));
             return tab;
         } else {
             mUi.showMaxTabsWarning();

src/com/android/browser/UrlUtils.java

diff --git a/src/com/android/browser/UrlUtils.java b/src/com/android/browser/UrlUtils.java
index 0a7e90c..d6278ca 100644
--- a/src/com/android/browser/UrlUtils.java
+++ b/src/com/android/browser/UrlUtils.java
@@ -152,7 +152,8 @@
         if (inUrl == null) {
             return "";
         }
-        if (inUrl.startsWith(HomeProvider.MOST_VISITED)) {
+        if (inUrl.startsWith("content:")
+                || inUrl.startsWith("browser:")) {
             return "";
         }
         return inUrl;