| Index: chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java
|
| index bd189f4bb9b23732cca6709f6e81c2de92d469df..76487bacf535c51c1d5912d7b0e76e43217bf8dd 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java
|
| @@ -75,12 +75,13 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
|
|
|
| /** Called when the SearchActivity has finished initialization. */
|
| void onDeferredStartup(boolean isVoiceSearchIntent) {
|
| + SearchWidgetProvider.updateCachedVoiceSearchAvailability(isVoiceSearchEnabled());
|
| if (isVoiceSearchIntent && mUrlBar.isFocused()) onUrlFocusChange(true);
|
| }
|
|
|
| /** Begins a new query. */
|
| void beginQuery(boolean isVoiceSearchIntent) {
|
| - if (isVoiceSearchIntent) {
|
| + if (isVoiceSearchEnabled() && isVoiceSearchIntent) {
|
| startVoiceRecognition();
|
| } else {
|
| focusTextBox();
|
|
|