fde948e69f59589cf0d217ea414af7947de600bb - DU-Final/packages_apps_QuickSearchBox

commit	fde948e69f59589cf0d217ea414af7947de600bb	[log] [tgz]
author	Bjorn Bringert <bringert@android.com>	Thu Feb 11 10:46:21 2010 +0000
committer	Bjorn Bringert <bringert@android.com>	Mon Feb 15 21:47:08 2010 +0000
tree	7a3d3279d019b02e93155ea6335106cfbc3117c2
parent	ecf32641692eaa5051065ac783b721da7469f91b [diff]

Merge Google and Browser sources and call them Web

This required a gigantic refactoring of QuickSearchBox to work nicely.

This change also reduces the number of promoted source to 3,
since Web is now one source instead of two.

As a side effect of the recatoring, VoiceSearch now searches
the selected corpus (fixes http://b/issue?id=2438309)

Fixes http://b/issue?id=2365770

Change-Id: Ife8d40ef62ea004e8d0f20a60e9196fc589f01fc

AndroidManifest.xml[diff]
res/drawable-hdpi/corpus_icon_global.png[Renamed from res/drawable-hdpi/global_search_source.png - diff]
res/drawable-hdpi/corpus_icon_web.png[Added - diff]
res/drawable-hdpi/corpus_selection_dialog_bg.9.png[Renamed from res/drawable-hdpi/select_search_source_bg.9.png - diff]
res/drawable-mdpi/corpus_icon_global.png[Renamed from res/drawable-mdpi/global_search_source.png - diff]
res/drawable-mdpi/corpus_icon_web.png[Added - diff]
res/drawable-mdpi/corpus_selection_dialog_bg.9.png[Renamed from res/drawable-mdpi/select_search_source_bg.9.png - diff]
res/layout/corpus_grid_item.xml[Renamed from res/layout/source_list_item.xml - diff]
res/layout/corpus_indicator.xml[Renamed from res/layout/search_source_selector.xml - diff]
res/layout/corpus_selection_dialog.xml[Renamed from res/layout/select_search_source.xml - diff]
res/layout/search_bar.xml[diff]
res/layout/search_widget.xml[diff]
res/layout/widget_config.xml[diff]
res/values/browser_search_component.xml[Added - diff]
res/values/default_corpora.xml[Added - diff]
res/values/dimens.xml[diff]
res/values/strings.xml[diff]
res/values/trusted_search_providers.xml[Deleted - diff]
res/xml/preferences.xml[diff]
src/com/android/quicksearchbox/AbstractCorpus.java[Added - diff]
src/com/android/quicksearchbox/AbstractSourceSuggestionCursor.java[Deleted - diff]
src/com/android/quicksearchbox/AbstractSuggestionCursor.java[diff]
src/com/android/quicksearchbox/AbstractSuggestionCursorWrapper.java[Added - diff]
src/com/android/quicksearchbox/AbstractSuggestionsProvider.java[diff]
src/com/android/quicksearchbox/Config.java[diff]
src/com/android/quicksearchbox/Corpora.java[Added - diff]
src/com/android/quicksearchbox/Corpus.java[Added - diff]
src/com/android/quicksearchbox/CorpusRanker.java[Renamed from src/com/android/quicksearchbox/SourceFactory.java - diff]
src/com/android/quicksearchbox/CorpusResult.java[Copied from src/com/android/quicksearchbox/SourceFactory.java - diff]
src/com/android/quicksearchbox/CorpusSelectionDialog.java[Renamed from src/com/android/quicksearchbox/SelectSearchSourceDialog.java - diff]
src/com/android/quicksearchbox/CursorBackedSuggestionCursor.java[diff]
src/com/android/quicksearchbox/DefaultCorpusRanker.java[Added - diff]
src/com/android/quicksearchbox/DelayingSourceTaskExecutor.java[diff]
src/com/android/quicksearchbox/EventLogLogger.java[diff]
src/com/android/quicksearchbox/EventLogTags.logtags[diff]
src/com/android/quicksearchbox/GlobalSuggestionsProvider.java[diff]
src/com/android/quicksearchbox/Launcher.java[diff]
src/com/android/quicksearchbox/ListSuggestionCursor.java[diff]
src/com/android/quicksearchbox/ListSuggestionCursorNoDuplicates.java[diff]
src/com/android/quicksearchbox/Logger.java[diff]
src/com/android/quicksearchbox/PackageIconLoader.java[diff]
src/com/android/quicksearchbox/Promoter.java[diff]
src/com/android/quicksearchbox/QsbApplication.java[diff]
src/com/android/quicksearchbox/ReverseComparator.java[Copied from src/com/android/quicksearchbox/SourceFactory.java - diff]
src/com/android/quicksearchbox/RoundRobinPromoter.java[diff]
src/com/android/quicksearchbox/SearchActivity.java[diff]
src/com/android/quicksearchbox/SearchSettings.java[diff]
src/com/android/quicksearchbox/SearchWidgetConfigActivity.java[diff]
src/com/android/quicksearchbox/SearchWidgetProvider.java[diff]
src/com/android/quicksearchbox/SearchableCorpora.java[Added - diff]
src/com/android/quicksearchbox/SearchableSource.java[diff]
src/com/android/quicksearchbox/SearchableSourceFactory.java[Deleted - diff]
src/com/android/quicksearchbox/SearchableSources.java[Added - diff]
src/com/android/quicksearchbox/ShortcutCursor.java[diff]
src/com/android/quicksearchbox/ShortcutPromoter.java[diff]
src/com/android/quicksearchbox/ShortcutRefresher.java[diff]
src/com/android/quicksearchbox/ShortcutRepository.java[diff]
src/com/android/quicksearchbox/ShortcutRepositoryImplLog.java[diff]
src/com/android/quicksearchbox/ShouldQueryStrategy.java[diff]
src/com/android/quicksearchbox/SingleCorpusSuggestionsProvider.java[Renamed from src/com/android/quicksearchbox/SingleSourceSuggestionsProvider.java - diff]
src/com/android/quicksearchbox/SingleSourceCorpus.java[Added - diff]
src/com/android/quicksearchbox/SingleSourceCorpusResult.java[Added - diff]
src/com/android/quicksearchbox/Source.java[diff]
src/com/android/quicksearchbox/SourceLookup.java[Deleted - diff]
src/com/android/quicksearchbox/SourceResult.java[diff]
src/com/android/quicksearchbox/SourceTask.java[diff]
src/com/android/quicksearchbox/Sources.java[Deleted - diff]
src/com/android/quicksearchbox/SuggestionCursor.java[diff]
src/com/android/quicksearchbox/SuggestionCursorWrapper.java[Added - diff]
src/com/android/quicksearchbox/SuggestionPosition.java[diff]
src/com/android/quicksearchbox/Suggestions.java[diff]
src/com/android/quicksearchbox/SuggestionsProvider.java[diff]
src/com/android/quicksearchbox/WebCorpus.java[Added - diff]
src/com/android/quicksearchbox/WebSource.java[Deleted - diff]
src/com/android/quicksearchbox/ui/CorporaAdapter.java[Renamed from src/com/android/quicksearchbox/ui/SourcesAdapter.java - diff]
src/com/android/quicksearchbox/ui/CorpusIndicator.java[Added - diff]
src/com/android/quicksearchbox/ui/CorpusView.java[Renamed from src/com/android/quicksearchbox/ui/SourceView.java - diff]
src/com/android/quicksearchbox/ui/DefaultSuggestionView.java[diff]
src/com/android/quicksearchbox/ui/DelayingSuggestionsAdapter.java[diff]
src/com/android/quicksearchbox/ui/SearchSourceSelector.java[Deleted - diff]
src/com/android/quicksearchbox/ui/SuggestionClickListener.java[diff]
src/com/android/quicksearchbox/ui/SuggestionSelectionListener.java[diff]
src/com/android/quicksearchbox/ui/SuggestionView.java[diff]
src/com/android/quicksearchbox/ui/SuggestionViewFactory.java[diff]
src/com/android/quicksearchbox/ui/SuggestionViewInflater.java[diff]
src/com/android/quicksearchbox/ui/SuggestionsAdapter.java[diff]
src/com/android/quicksearchbox/ui/SuggestionsView.java[diff]
tests/src/com/android/quicksearchbox/ConcatPromoter.java[diff]
tests/src/com/android/quicksearchbox/CorporaTest.java[Renamed from tests/src/com/android/quicksearchbox/SourcesTest.java - diff]
tests/src/com/android/quicksearchbox/DataSuggestionCursor.java[diff]
tests/src/com/android/quicksearchbox/MockCorpus.java[Added - diff]
tests/src/com/android/quicksearchbox/MockShortcutRepository.java[diff]
tests/src/com/android/quicksearchbox/MockSource.java[diff]
tests/src/com/android/quicksearchbox/MockSourceFactory.java[Deleted - diff]
tests/src/com/android/quicksearchbox/PackageIconLoaderTest.java[diff]
tests/src/com/android/quicksearchbox/QueryThreadFactoryTest.java[diff]
tests/src/com/android/quicksearchbox/ShortcutPromoterTest.java[diff]
tests/src/com/android/quicksearchbox/ShouldQueryStrategyTest.java[diff]
tests/src/com/android/quicksearchbox/SuggestionData.java[diff]

99 files changed

tree: 7a3d3279d019b02e93155ea6335106cfbc3117c2