commit 5e8f2b9cf44263ac77a21653eb3c012a98c3587f
author Michael Kolb <kolby@google.com> Tue Jul 19 13:22:32 2011 -0700
committer Michael Kolb <kolby@google.com> Tue Jul 19 13:22:37 2011 -0700
tree 64bc3d78d5a7bd0995be40eb8a9378d9a9e97d21
parent e57c709438aec9d64e3de7eefd87f333fcd2ae7c

show voice icon if in voice mode

     Bug: 5005932
     The voice icon is shown in the url bar in non-focused
     state when there are voice results

Change-Id: Id89052938768cb1b4e17895986d49129df78017d

src/com/android/browser/NavigationBarPhone.java

diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index 7e367a4..2030169 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -116,11 +116,11 @@
     @Override
     public void onProgressStopped() {
         super.onProgressStopped();
-        mStopButton.setVisibility(View.GONE);
         mStopButton.setImageDrawable(mRefreshDrawable);
         if (!isEditingUrl()) {
             mComboIcon.setVisibility(View.VISIBLE);
         }
+        onStateChanged(mUrlInput.getState());
     }
 
     /**
@@ -236,7 +236,7 @@
         case StateListener.STATE_NORMAL:
             mComboIcon.setVisibility(View.VISIBLE);
             mStopButton.setVisibility(View.GONE);
-            setSearchMode(false);
+            setSearchMode(mInVoiceMode);
             mTabSwitcher.setVisibility(View.VISIBLE);
             mTitleContainer.setBackgroundDrawable(null);
             mMore.setVisibility(mNeedsMenu ? View.VISIBLE : View.GONE);

src/com/android/browser/UrlInputView.java

diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java
index 8b5c292..2acc69b 100644
--- a/src/com/android/browser/UrlInputView.java
+++ b/src/com/android/browser/UrlInputView.java
@@ -187,6 +187,10 @@
         }
     }
 
+    int getState() {
+        return mState;
+    }
+
     void setVoiceResults(List<String> voiceResults) {
         mAdapter.setVoiceResults(voiceResults);
     }