History log of /packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
77909685887bd6db7454b73cf274afc3aca2f58d 17-Nov-2010 Bjorn Bringert <bringert@android.com> Clean up suggestion layouts and fix spacing

This adds a special layout for web suggestions,
with fewer views, and moves all the web search suggestion specific
code out of DefaultSuggestionView.
It also gets rid of the per-source SuggestionViewFactories and creates
a global factory that delegates to other factories. This is to make
the choice of view dependent on the suggestion type instead of the
source.

Bug: 3202129
Bug: 3202115
Change-Id: Ie1963acd90bedda523f6c25c26b76b6a075b41af
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
516781305d7427e79928c95c6ea2b7689a4bf6ce 20-Oct-2010 Mathew Inwood <mathewi@google.com> Improve PackageIconLoader thread handing.

It now used a NamedTaskExecutor, to ensure that threads don't get
leaked when the sources are recreated.

Dependant on change: I68c047ca9d96432dcf90e79bfc2195aaab48b0b9

Change-Id: Ia92f1e8feb920f7a2a5e31c984fc11e826828eff
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
e29d52aa72c96c3147fa91d83aeb8dafc6d1f578 08-Oct-2010 Mathew Inwood <mathewi@google.com> Load icons from other processes in a seperate thread.

This protects againts the process not responding, which previously caused QSB to
lock up. We also protect against the process throwing an exception in the same
case.

This change causes some icons to load after the suggestions are displayed. For
example, contact photos are displayed shortly after the contacts show, but the
quick contact badge is visible immediately. This only happens for suggestions
with content:// URIs for the icons.

Bug: 3064103

Change-Id: I23f36a82d381ea76897d65fe2f3ec46f6642b7d5
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
53aab8c4459f45664d04ec882d67094c52b78695 06-Oct-2010 Bjorn Bringert <bringert@android.com> Replace Source.isWebSuggestionSource() with getMaxShortcuts()

Change-Id: I7986d291f0608b231a9708caf691a97694cc011d
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
5229b06f00d20aac76cd8519b37f2a579d61c54f 01-Oct-2010 Mathew Inwood <mathewi@google.com> Support for custom suggestion views.

Each Source can now define its own view factory to be used to display
suggestions from that source. Suggestions now also support extras (extra
columns in the cursor) that can be displayed in a custom suggestion layout.

Change-Id: Ie8dcedbbccfe7673804703adc8fabaae467626d9
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
f3f70e5ae88f06ff6dabdec9e7c71a19ca1e7108 04-Oct-2010 Bjorn Bringert <bringert@android.com> Allow corpora to be excluded from All but still enabled

Also removes the obsolete isLocationAware() method.

Bug: 3054864
Change-Id: I0fbf707a1a9932e0ccc886d48a6dadc500e87422
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
09552c760ad82eb90795e98de96c65005d6ebafc 03-Sep-2010 Mathew Inwood <mathewi@google.com> Change to make defaulting of Contacts corpora more reliable.

The package that provided contacts results is looked up at run-time now,
rather than being hardcoded. This should allow it to work on devices
where the default contacts provider is replaced.

Bug: 2970922

Change-Id: I598e8083cc12b4f6f447d5d48f5f83281d700cb3
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
e46ac8349b012ec2c649d4e20bc835fec9ec681f 29-Jun-2010 Bjorn Bringert <bringert@android.com> Remove all use of public drawables in QSB

Before, QSB used a number of public drawables. This is not safe, as
partner platform customizations can change the color schemes in the
icons, which may not match the color scheme in QSB. This can be a
usability problem, e.g. with grey icons on grey backgrounds.

Changes made:

- Copy drawable.sym_def_app_icon.png from the framework
to corpus_icon_apps.png and corpus_icon_default.png. This introduces
as useful distinction between the Apps corpus icon and the icon used for
corpora that have no icon.

- Fix bug in SearchableSource where it looked up the default corpus
icon in the corpus package instead of in the QSB package.

- Copy ic_menu_preferences.png from the framework resources and use it
as the menu icon for Settings.

- Copy btn_dialog.xml from the framework resources and use it in
the Voice Search hint.

- Re-enable Voice Search hints. They had been accidentally disabled by
an earlier change.

Bug: 2807186
Bug: 2807268
Change-Id: I66c8f58af7737be3a4c8a0fb330acc15f1bb6808
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
93bd2e70b8b08da1ec37fd0e990dac05551d2e90 29-Jun-2010 Bjorn Bringert <bringert@android.com> Another big QSB refactoring

- Change GoogleSource to return a suggestion cursor backed directly
by the JSON returned by the server, to avoid unecessary conversions
when showing web suggestions in QSB and improve laziness.

- Add SuggestionCursorBackedCursor to keep the web suggestion
ContentProvider working after the above.

- Extract Suggestion interface from SuggestionCursor, and use it to
replace DataSuggestionCursor use with ListSuggestionCursor.

- Add GoogleClient.isLocationAware(). GoogleSource previously
always returned true.

Change-Id: Ibe5ab2839267546b15488fa0a31e8535c014232a
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
49fd8e0994577badc6194c2c3b5f771f2b793fe4 28-Jun-2010 Bjorn Bringert <bringert@android.com> Refactoring to make QSB more modular

Change-Id: I3bd5444bdcf4ac62a921c8c921306cc17aa440dc
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
cd1e3ba5f7c3f5242345ff6f674281e3d6366e24 22-Jun-2010 Mathew Inwood <mathewi@google.com> Allow corpora to differ results when only 1 is selected.

Corpus and Source now know when they're the only corpus/source being queried so can tailor the results returned accordingly.

Change-Id: I586dfa4226bbbad83d4f2ed70c9935a638f6caf5
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
839a9fd2828f37c9dc8345f93aefa5b8ad2f857f 17-Jun-2010 Bjorn Bringert <bringert@android.com> Drop "query jamming" feature from QSB

Before, QSB put the text of web suggestions in the query field when
selecting a suggestion with the DPAD or trackball. The code for this
was complex and error-prone (see for example http://b/issue?id=2515755
and http://b/issue?id=2748984). Now there is an on-screen button to
put the suggestion text in the query field. Thus we should remove this
feature.

Bug http://b/issue?id=2776271

Change-Id: Iebafc24cffca0c7cf113e426564ad22bb93da738
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
81a0897ff9685f3313c58294bf7973700c468b2b 11-May-2010 Bjorn Bringert <bringert@android.com> Refactoring to prepare for external shortcuts

This change is meant to have no user-visible effects

Change-Id: Idf3a6d892ba84307a887785725aa072bd28c59b6
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
3f00b91235290a95a8ff9394a3612935d602ef20 03-Apr-2010 Bjorn Bringert <bringert@android.com> Allow Apps corpus Go button to use a custom search activity

Bug: http://b/issue?id=2559078
Change-Id: Id8fbdecb42e8cb21ef57085fb9c35df0d347fcdb
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
7a9b12c46680a5b88b5d9fcbcc553d0d5b74cb63 29-Mar-2010 Bjorn Bringert <bringert@android.com> Remove unused action key methods

The action key interface will not be exposed in Froyo,
and we weren't using these methods anyway.

Bug http://b/issue?id=2553524

Change-Id: I326e6784e232b303166b315314bb463ecae09941
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
25f44e14e0638b84b0a3f40f3f1a663cc3e999cb 19-Mar-2010 Bjorn Bringert <bringert@android.com> Create source contexts lazily

Bug http://b/issue?id=2500425

Change-Id: Ibf99370918722ff0b4332912f8ae8bdb46f137e2
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
b5fc08b7f16a32d3865f44b7f26d8aaa5304a2ad 19-Mar-2010 Bjorn Bringert <bringert@android.com> Disable debug logging and remove unused imports and classes

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

Change-Id: I2416c9b6c1b9e819ec17d7954b6b70bf106f0414
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
2353e9c002c45c0adc8a979a49ff317cae5838b8 15-Mar-2010 Bjorn Bringert <bringert@android.com> Use resource names in stored shortcut icons URIs

This makes the URIs in shortcuts for suggestions produced
by QSB stable across upgrades (as long as the resource names
don't change).

http://b/issue?id=2513568

Change-Id: I17a8c06fcbc36f439c0751bb4dd0cb8789cb5e6b
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
cc10dcf07c4e787abd66f4e2cfed31a09580a3b0 14-Mar-2010 Bjorn Bringert <bringert@android.com> Allow installing QuickSearchBox in data partition

Changes:

- Only use sources that the QSB process can read. This will exclude
any sources protected by the GLOBAL_SEARCH permission when
QSB is in the data partition.

- Add permission to read bookmarks, needed by Web source
when QuickSearchBox doesn't have the GLOBAL_SEARCH permission.

- Change QuickSearchBox icon to a generic magnifying glass, to make it
different from GoogleQuickSearchBox.

- Change All corpus icon to be the same as the app icon
(magnifying glass).

- Set package name in home screen search widget intents, so that
the correct search app is started.

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

Change-Id: I47892b011c06ebb000cd975bad057eeecc4d34db
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
6d5cbd67f7a5f824babb5c892b0f30bfd9f4ff23 12-Mar-2010 Bjorn Bringert <bringert@android.com> Don't show shortcuts for upgraded apps

This required moving the limit on the number of shortcuts
returned from the SQL query to the ShortcutCursor constructor.

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

Change-Id: Icd2c71c31433429c005926497c1767ccc713beb4
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
62adab88055fd0ef6779242245cdc8c3ae5f999c 05-Mar-2010 Bjorn Bringert <bringert@android.com> More refactoring to enable Apps+Market source

Part of http://b/issue?id=2312744

Change-Id: I3d4bae54e55ade6901fb9d061ada226efd098549
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
bf61e445cbe423cc2554b722b6dd38675015c36d 03-Mar-2010 Bjorn Bringert <bringert@android.com> Only consider enabled corpora for promotion (doh!)

Before, all corpora, not just enabled ones, where considered
for promotion in RankAwarePromoter. This had the effect that web
was the only promoted source ever to be queried.

Also adds a lot of debug printing that helped track this down.

Fixed in http://b/issue?id=2486251

Change-Id: Ia739111b2ab1bf2c5aba8dd1eca29614ca20c407
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
f252dc7a25ba08b973ecc1cfbbce58eb78d42167 26-Feb-2010 Bjorn Bringert <bringert@android.com> Refactoring to make it easier to add the apps+market corpus

I created an abstract MultiSourceCorpus implementation
of Corpus, and changed WebCorpus to use that as its base class.
Once we have Market suggestions, I will use the same bas class for
the Apps corpus. This is part of the fix for http://b/issue?id=2312744

Change-Id: I804555a95ace92eeafd4922e27f86a90dda7889e
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
5691f9062b2a558ba39c700d65bc522d397ebc75 25-Feb-2010 Bjorn Bringert <bringert@android.com> Show "Google" hint for Web and All, source hint for others

Also, show cursor when query text field is empty.

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

Change-Id: I521f684e3c7487cd6003ca309b684c221b96e619
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
883c1bf364e38c5b133afb55f8493a14b65f4dd4 19-Feb-2010 Bjorn Bringert <bringert@android.com> Add a suggestions footer view

Also, refactor source and corpus creation. This turned out not
to be needed to fix the bug, but I think it was a good thing anyway.

Also, include a suggestion type in the qsb_click log.
This is only set for Genie suggestions at the moment.

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

Change-Id: I332c0566fedecccaae194304310c1f13d7201e2d
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
fde948e69f59589cf0d217ea414af7947de600bb 11-Feb-2010 Bjorn Bringert <bringert@android.com> 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
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
ecf32641692eaa5051065ac783b721da7469f91b 15-Feb-2010 Bryan Mawhinney <bryanmawhinney@google.com> Don't try to fetch text for missing Source descriptions.
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
8d9d845323514c34bb07d6eb91146a975324fced 10-Feb-2010 Bjorn Bringert <bringert@android.com> Use new SearchableInfo.getSettingsDescriptionId()

Part of http://b/issue?id=2175247

Change-Id: Ib946283c9150084136a6ef7cdaaa6a183dbf50b1
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
ca78085bb2127559e6f55276a307bfa857018eca 25-Jan-2010 Bjorn Bringert <bringert@android.com> Log QSB events to EventLog

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

Change-Id: I1522539e9038d5062522c17d38b61069a90fd7cc
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
94e8a2be78530170f50e7895a558bf8011bbf8e8 18-Jan-2010 Bryan Mawhinney <bryanmawhinney@google.com> Implement refreshing of shortcuts in QSB.
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
cec07f6776a01e811573653acb65f23a764fa55c 14-Jan-2010 Bjorn Bringert <bringert@android.com> Remove duplicate method Source.getSearchActivity().

It was the same as Source.getComponentName().

Change-Id: I60759517c3405cf3158cff55543eb23377bd36d4
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
e1fc4581ebab65220a82bcdb3272b4eb85453837 13-Jan-2010 Bjorn Bringert <bringert@android.com> Fix some uses of hidden stuff in QuickSearchBox

This is needed to allow compiling against the SDK. We can't quite compile
against the SDK yet, since there is some more hidden stuff to sort
out.

- Use android-common library to get AndroidHttpClient.

- Stop using SearchableInfo.getActivityContext() and
SearchableInfo.getProviderContext().

- Copy android.provider.Settings.Secure.isLocationProviderEnabled()
convenience method into the app.

- Stop using Resources.getCompatibilityInfo().

Change-Id: I92b08a4801798f305d04ea629a1f432ecf3ea833
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
abd33f7f8d8e56348a8a87bb9e7af491d83ee833 11-Jan-2010 Bjorn Bringert <bringert@android.com> Use source stats to order sources

This doesn't actually affect the ordering yet, since we aren't recording
impressions.

Change-Id: I6dcccc77cf5d0a6574cd5b74d57600d8abd62fba
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
d32d6753347e872aa5d9d6e9015ed7f24db3e362 08-Jan-2010 Bjorn Bringert <bringert@android.com> Remember last selected source, and show it in Launcher search widget

Change-Id: I775a1a3a757d5628ccc7c6fe8af6015ddd03e081
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
0484fb4d652bfa9d5c7fb238a7cec1a6f2244e44 08-Jan-2010 Bjorn Bringert <bringert@android.com> When a source is selected, query only that source.

Change-Id: Ic664cc4f4a6634af1e0bc5acc0818819fe874e41
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
782dd228e78e9294692d639597f96c26283968bb 16-Dec-2009 Bjorn Bringert <bringert@android.com> Fix suggestion key, click and selection handling.

Typing on the suggestions list and pressing action keys
still doesn't work.

I also made SuggestionData mutable and got rid of the builder.
This this is only for tests anyway, it was annoying to have to
add every field in 6+ places in this class.

Change-Id: I17c287b217fc1a03567123ddbd48638657b2f5cf
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
227180196cf8d92172cbb62f8ddaacf864be28e7 07-Dec-2009 Bjorn Bringert <bringert@android.com> Use SearchManager to get list of searchables

SerchableInfo and the methods that return it are not yet exposed, but they
will be soon.
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java
3e44ff1f2a204db3f479698cf0b3eab3d451dec2 03-Dec-2009 Bjorn Bringert <bringert@android.com> Import QuickSearchBox package from perforce.

This moves code from
//depot/google3/java/com/google/android/apps/quicksearchbox/...
The only changes done in the move are the package names
and the license headers.

The code does not yet build, since there is no Android.mk.

Change-Id: I768b06d211f5ee6ecd6f9777ba2839c09744fbf1
/packages/apps/QuickSearchBox/src/com/android/quicksearchbox/SearchableSource.java