Final formatting changes for QuickSearchBox .kt files
Ran ktfmt with Google (internal) style for all remaining .kt files.
Bug: 239665416
Test: manual testing with bramble device, unit tests ran with atest QuickSearchBoxTests with result:
Summary (Test executed with 1 devices.)
-------
arm64-v8a QuickSearchBoxTests: Passed: 50, Failed: 0, Ignored: 0, Assumption Failed: 0,
All tests passed!
Change-Id: Idc7b685012d9c5adb2190ad632b48f0950a64563
diff --git a/src/com/android/quicksearchbox/SuggestionsProviderImpl.kt b/src/com/android/quicksearchbox/SuggestionsProviderImpl.kt
index bc0f3c6..9c02c07 100644
--- a/src/com/android/quicksearchbox/SuggestionsProviderImpl.kt
+++ b/src/com/android/quicksearchbox/SuggestionsProviderImpl.kt
@@ -17,7 +17,6 @@
import android.os.Handler
import android.util.Log
-
import com.android.quicksearchbox.util.Consumer
import com.android.quicksearchbox.util.NamedTaskExecutor
import com.android.quicksearchbox.util.NoOpConsumer
@@ -25,85 +24,75 @@
/**
* Suggestions provider implementation.
*
- * The provider will only handle a single query at a time. If a new query comes
- * in, the old one is cancelled.
+ * The provider will only handle a single query at a time. If a new query comes in, the old one is
+ * cancelled.
*/
class SuggestionsProviderImpl(
- private val mConfig: Config,
- private val mQueryExecutor: NamedTaskExecutor,
- publishThread: Handler?,
- logger: Logger?
+ private val mConfig: Config,
+ private val mQueryExecutor: NamedTaskExecutor,
+ publishThread: Handler?,
+ logger: Logger?
) : SuggestionsProvider {
- private val mPublishThread: Handler?
+ private val mPublishThread: Handler?
- private val mLogger: Logger?
+ private val mLogger: Logger?
+ @Override override fun close() {}
+
+ @Override
+ override fun getSuggestions(query: String, source: Source): Suggestions {
+ if (DBG) Log.d(TAG, "getSuggestions($query)")
+ val suggestions = Suggestions(query, source)
+ Log.i(TAG, "chars:" + query.length.toString() + ",source:" + source)
+ val receiver: Consumer<SourceResult?>
+ if (shouldDisplayResults(query)) {
+ receiver = SuggestionCursorReceiver(suggestions)
+ } else {
+ receiver = NoOpConsumer()
+ suggestions.done()
+ }
+ val maxResults: Int = mConfig.maxResultsPerSource
+ QueryTask.startQuery(query, maxResults, source, mQueryExecutor, mPublishThread, receiver)
+ return suggestions
+ }
+
+ private fun shouldDisplayResults(query: String): Boolean {
+ return !(query.isEmpty() && !mConfig.showSuggestionsForZeroQuery())
+ }
+
+ private inner class SuggestionCursorReceiver(private val mSuggestions: Suggestions) :
+ Consumer<SourceResult?> {
@Override
- override fun close() {
- }
-
- @Override
- override fun getSuggestions(query: String, source: Source): Suggestions {
- if (DBG) Log.d(
- TAG,
- "getSuggestions($query)"
+ override fun consume(value: SourceResult?): Boolean {
+ if (DBG) {
+ Log.d(
+ TAG,
+ "SuggestionCursorReceiver.consume(" +
+ value +
+ ") corpus=" +
+ value?.source +
+ " count = " +
+ value?.count
)
- val suggestions = Suggestions(query, source)
- Log.i(
- TAG,
- "chars:" + query.length.toString() + ",source:" + source
- )
- val receiver: Consumer<SourceResult?>
- if (shouldDisplayResults(query)) {
- receiver = SuggestionCursorReceiver(suggestions)
- } else {
- receiver = NoOpConsumer()
- suggestions.done()
- }
- val maxResults: Int = mConfig.maxResultsPerSource
- QueryTask.startQuery(
- query, maxResults, source, mQueryExecutor,
- mPublishThread, receiver
- )
- return suggestions
+ }
+ // publish immediately
+ if (DBG) Log.d(TAG, "Publishing results")
+ mSuggestions.addResults(value)
+ if (value != null && mLogger != null) {
+ mLogger.logLatency(value)
+ }
+ return true
}
+ }
- private fun shouldDisplayResults(query: String): Boolean {
- return !(query.isEmpty() && !mConfig.showSuggestionsForZeroQuery())
- }
+ companion object {
+ private const val DBG = false
+ private const val TAG = "QSB.SuggestionsProviderImpl"
+ }
- private inner class SuggestionCursorReceiver(private val mSuggestions: Suggestions) :
- Consumer<SourceResult?> {
- @Override
- override fun consume(value: SourceResult?): Boolean {
- if (DBG) {
- Log.d(
- TAG,
- "SuggestionCursorReceiver.consume(" + value + ") corpus=" +
- value?.source + " count = " + value?.count
- )
- }
- // publish immediately
- if (DBG) Log.d(
- TAG,
- "Publishing results"
- )
- mSuggestions.addResults(value)
- if (value != null && mLogger != null) {
- mLogger.logLatency(value)
- }
- return true
- }
- }
-
- companion object {
- private const val DBG = false
- private const val TAG = "QSB.SuggestionsProviderImpl"
- }
-
- init {
- mPublishThread = publishThread
- mLogger = logger
- }
-}
\ No newline at end of file
+ init {
+ mPublishThread = publishThread
+ mLogger = logger
+ }
+}
