commit 3a2a1647324c6d87c4599febfb207a9a661fb0c0
author Michael Kolb <kolby@google.com> Tue Feb 15 10:52:07 2011 -0800
committer Michael Kolb <kolby@google.com> Tue Feb 15 10:52:45 2011 -0800
tree a95e389a7491cf0299e1b55ec80b259afaceaa39
parent 9d27ff5437db16b7ca16ec8cea464aaefdacc17e

Fix voice search mode

    Bug: 3410067
    Fixes voice search mode
    Fixes two buttons to the left of the url
    This CL does not fix the voice button to the right yet.

Change-Id: I743f8d97811fc4dfc0488d27fc08cac10fdd1043

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/TitleBarXLarge.java

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 453e1b8..f44006d 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -449,6 +449,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);
     }