diff options
| author | Michael Kolb <kolby@google.com> | 2010-12-14 10:36:11 -0800 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2010-12-15 09:12:17 -0800 |
| commit | cfa3af5c59abb38c895416a80ef16da0ec1b5287 (patch) | |
| tree | 18afb4abaf1539d46c3eec57100cca1faa5877fb /src/com/android/browser/XLargeUi.java | |
| parent | 478b2442684004d6dfe192c0ae3dd04845b9f1b7 (diff) | |
| download | packages_apps_Browser-cfa3af5c59abb38c895416a80ef16da0ec1b5287.tar.gz packages_apps_Browser-cfa3af5c59abb38c895416a80ef16da0ec1b5287.tar.bz2 packages_apps_Browser-cfa3af5c59abb38c895416a80ef16da0ec1b5287.zip | |
Enable voice search
http://b/issue?id=3039695
send voice search intent
implement voice search title bar
also fixes another Urlbar focus handling bug
Change-Id: Icdcbec9ffff586d445545cc7fe86ca045022f381
Diffstat (limited to 'src/com/android/browser/XLargeUi.java')
| -rw-r--r-- | src/com/android/browser/XLargeUi.java | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java index 30180aa18..69e67242d 100644 --- a/src/com/android/browser/XLargeUi.java +++ b/src/com/android/browser/XLargeUi.java @@ -46,7 +46,9 @@ public class XLargeUi extends BaseUi implements ScrollListener { super(browser, controller); mTitleBar = new TitleBarXLarge(mActivity, mUiController, this); mTitleBar.setProgress(100); + mTitleBar.setEditable(false); mFakeTitleBar = new TitleBarXLarge(mActivity, mUiController, this); + mFakeTitleBar.setEditable(true); ActionBar actionBar = mActivity.getActionBar(); mTabBar = new TabBar(mActivity, mUiController, this); actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); @@ -218,4 +220,26 @@ public class XLargeUi extends BaseUi implements ScrollListener { mTabBar.onFavicon(tab, icon); } + @Override + public void showVoiceTitleBar(String title) { + List<String> vsresults = null; + if (getActiveTab() != null) { + vsresults = getActiveTab().getVoiceSearchResults(); + } + mTitleBar.setInVoiceMode(true, null); + mTitleBar.setDisplayTitle(title); + mFakeTitleBar.setInVoiceMode(true, vsresults); + mFakeTitleBar.setDisplayTitle(title); + } + + @Override + public void revertVoiceTitleBar(Tab tab) { + mTitleBar.setInVoiceMode(false, null); + String url = tab.getCurrentUrl(); + mTitleBar.setDisplayTitle(url); + mFakeTitleBar.setInVoiceMode(false, null); + mFakeTitleBar.setDisplayTitle(url); + } + + } |
