summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/Tab.java
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2010-09-14 14:02:36 -0400
committerLeon Scroggins III <scroggo@google.com>2010-09-14 14:02:36 -0400
commit95d9bfd1d67902a8aa5d2e529db7f7064db081b7 (patch)
tree0b9fec679e245fd956bdc848e93f68399e234d01 /src/com/android/browser/Tab.java
parent430057dad085f3c3dbc386f127b1f5a10a9851da (diff)
downloadpackages_apps_Browser-95d9bfd1d67902a8aa5d2e529db7f7064db081b7.zip
packages_apps_Browser-95d9bfd1d67902a8aa5d2e529db7f7064db081b7.tar.gz
packages_apps_Browser-95d9bfd1d67902a8aa5d2e529db7f7064db081b7.tar.bz2
Clear voice search mode when changing search engines.
Not all search engines support voice search. Also, different search engines may support them differently. So if we are already in voice search mode when the search engine changes, exit the mode. Change-Id: I8d3f200f4829ad1383d554214c9d56d5c0b96aed
Diffstat (limited to 'src/com/android/browser/Tab.java')
-rw-r--r--src/com/android/browser/Tab.java16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 2dac050..1700961 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -165,6 +165,17 @@ class Tab {
*/
private VoiceSearchData mVoiceSearchData;
/**
+ * Remove voice search mode from this tab.
+ */
+ public void revertVoiceSearchMode() {
+ if (mVoiceSearchData != null) {
+ mVoiceSearchData = null;
+ if (mInForeground) {
+ mActivity.revertVoiceTitleBar();
+ }
+ }
+ }
+ /**
* Return whether the tab is in voice search mode.
*/
public boolean isInVoiceSearchMode() {
@@ -457,10 +468,7 @@ class Tab {
i.putExtra(LoggingEvents.EXTRA_FLUSH, true);
mActivity.sendBroadcast(i);
}
- mVoiceSearchData = null;
- if (mInForeground) {
- mActivity.revertVoiceTitleBar();
- }
+ revertVoiceSearchMode();
}
// We've started to load a new page. If there was a pending message