commit 9b20d738a36f883dae29bd08e35eef25e99310f9
author John Reck <jreck@google.com> Tue Feb 15 12:54:03 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 15 12:54:03 2011 -0800
tree 121598056460ddeae666243a55da4b8b90265420
parent e43329a969c804d47d8abff96d5825688b8eb2b4
parent 92026735c1097fd71c6d50410e2af93e077381cd

Merge "Switch the phone to use the omnibox instead of qsb"

res/layout/url_bar.xml

diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index 526e44c..e925a58 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -61,7 +61,7 @@
                 android:id="@+id/voice_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:src="@drawable/ic_search_holo_dark"
+                android:src="@drawable/ic_voice_search_holo_dark"
                 style="@style/HoloIcon"
                 android:visibility="gone" />
             <ImageView

src/com/android/browser/GoogleAccountLogin.java

diff --git a/src/com/android/browser/GoogleAccountLogin.java b/src/com/android/browser/GoogleAccountLogin.java
index eaf45ea..3712490 100644
--- a/src/com/android/browser/GoogleAccountLogin.java
+++ b/src/com/android/browser/GoogleAccountLogin.java
@@ -336,7 +336,7 @@
                 @Override public void run() {
                     mProgressDialog.dismiss();
                 }
-            }, 1000);
+            }, 2000);
 
             mRunnable = null;
             mWebView.destroy();

src/com/android/browser/TitleBarXLarge.java

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index e53d7f3..2aa5bb9 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -382,6 +382,7 @@
         mUrlInput.setVoiceResults(voiceResults);
         mVoiceSearchIndicator.setVisibility(mInVoiceMode
                 ? View.VISIBLE : View.GONE);
+        mWebIcon.setVisibility(mInVoiceMode ? View.GONE : View.VISIBLE);
     }
 
     @Override

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 3e200ea..88df015 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -357,7 +357,7 @@
         if (getActiveTab() != null) {
             vsresults = getActiveTab().getVoiceSearchResults();
         }
-        mTitleBar.setInVoiceMode(true, null);
+        mTitleBar.setInVoiceMode(true, vsresults);
         mTitleBar.setDisplayTitle(title);
     }