diff options
| author | Michael Kolb <kolby@google.com> | 2011-07-19 13:22:32 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2011-07-19 13:22:37 -0700 |
| commit | 5e8f2b9cf44263ac77a21653eb3c012a98c3587f (patch) | |
| tree | 64bc3d78d5a7bd0995be40eb8a9378d9a9e97d21 /src/com | |
| parent | e57c709438aec9d64e3de7eefd87f333fcd2ae7c (diff) | |
| download | packages_apps_Browser-5e8f2b9cf44263ac77a21653eb3c012a98c3587f.tar.gz packages_apps_Browser-5e8f2b9cf44263ac77a21653eb3c012a98c3587f.tar.bz2 packages_apps_Browser-5e8f2b9cf44263ac77a21653eb3c012a98c3587f.zip | |
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
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/browser/NavigationBarPhone.java | 4 | ||||
| -rw-r--r-- | src/com/android/browser/UrlInputView.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java index 7e367a46a..2030169af 100644 --- a/src/com/android/browser/NavigationBarPhone.java +++ b/src/com/android/browser/NavigationBarPhone.java @@ -116,11 +116,11 @@ public class NavigationBarPhone extends NavigationBarBase implements @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 @@ public class NavigationBarPhone extends NavigationBarBase implements 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); diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java index 8b5c29289..2acc69b05 100644 --- a/src/com/android/browser/UrlInputView.java +++ b/src/com/android/browser/UrlInputView.java @@ -187,6 +187,10 @@ public class UrlInputView extends SuggestiveAutoCompleteTextView } } + int getState() { + return mState; + } + void setVoiceResults(List<String> voiceResults) { mAdapter.setVoiceResults(voiceResults); } |