Matthew Fritze a504291eef resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I382d6f881cbfebb7692cbe49a14d9a7cc04d824e

2017-07-31 17:10:24 -07:00

..

ranking

Updating the search ranking API and some improvements:

2017-06-02 12:09:20 -07:00

AppSearchResult.java

Fix searching work app in settings

2017-06-16 10:55:49 +00:00

BaseSearchIndexProvider.java

Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev

2017-07-25 21:30:57 +00:00

CursorToSearchResultConverter.java

Add list-select as an inline result

2017-06-28 11:21:55 -07:00

DatabaseIndexingManager.java

Reindex db when package w/ searchIndexProvider changes

2017-07-21 13:06:03 -07:00

DatabaseIndexingUtils.java

Reindex db when package w/ searchIndexProvider changes

2017-07-21 13:06:03 -07:00

DatabaseResultLoader.java

Trim search query when initializing installed app searcher.

2017-06-27 19:48:54 +00:00

DynamicIndexableContentMonitor.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

Indexable.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

IndexDatabaseHelper.java

Reindex db when package w/ searchIndexProvider changes

2017-07-21 13:06:03 -07:00

IndexingCallback.java

Prevent race conditions after dropping database

2017-05-08 18:48:04 +00:00

InlineListPayload.java

Add default value to inline payloads

2017-07-25 14:37:05 -07:00

InlinePayload.java

Add default value to inline payloads

2017-07-25 14:37:05 -07:00

InlineSwitchPayload.java

Add default value to inline payloads

2017-07-25 14:37:05 -07:00

InlineSwitchViewHolder.java

Updating the search ranking API and some improvements:

2017-06-02 12:09:20 -07:00

InstalledAppResultLoader.java

Trim search query when initializing installed app searcher.

2017-06-27 19:48:54 +00:00

IntentSearchViewHolder.java

Query search result intent before launching to avoid crash

2017-07-28 00:52:04 +00:00

ResultPayload.java

resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev

2017-07-31 17:10:24 -07:00

ResultPayloadUtils.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

SavedQueryController.java

Improve search indexing time.

2017-07-18 14:53:49 -07:00

SavedQueryLoader.java

Update Settings search result unique ids

2017-05-23 15:38:29 -07:00

SavedQueryPayload.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

SavedQueryRecorder.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

SavedQueryRemover.java

Misc search fix

2017-07-14 15:29:57 -07:00

SavedQueryViewHolder.java

Misc search fix

2017-07-14 15:29:57 -07:00

SearchActivity.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

SearchFeatureProvider.java

Improve search indexing time.

2017-07-18 14:53:49 -07:00

SearchFeatureProviderImpl.java

Improve search indexing time.

2017-07-18 14:53:49 -07:00

SearchFragment.java

Add shadow to searchbar when user scrolls vertically

2017-07-21 01:34:46 +00:00

SearchIndexableRaw.java

…

SearchIndexableResources.java

Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev

2017-07-25 21:30:57 +00:00

SearchResult.java

Update Settings search result unique ids

2017-05-23 15:38:29 -07:00

SearchResultDiffCallback.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

SearchResultsAdapter.java

Log async ranking state in Settings search ranking

2017-07-05 13:04:22 -07:00

SearchViewHolder.java

Fix searching work app in settings

2017-06-16 10:55:49 +00:00

SettingsSearchIndexablesProvider.java

Improve search indexing time.

2017-07-18 14:53:49 -07:00

XmlParserUtils.java

Cleanups in XmlParserUtils.

2017-07-14 12:25:54 -07:00