Enable "no suggestions" and ensure it doesn't flash up on the screen

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -1157,8 +1157,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
 
                 if (viewState.showSuggestions) {
                     autoCompleteSuggestionsList.show()
-                    val results = viewState.searchResults.suggestions
-                    autoCompleteSuggestionsAdapter.updateData(results)
+                    autoCompleteSuggestionsAdapter.updateData(viewState.searchResults.query, viewState.searchResults.suggestions)
                 } else {
                     autoCompleteSuggestionsList.gone()
                 }

app/src/main/java/com/duckduckgo/app/browser/autocomplete/BrowserAutoCompleteSuggestionsAdapter.kt

@@ -28,16 +28,17 @@ import com.duckduckgo.app.browser.autocomplete.BrowserAutoCompleteSuggestionsAda
 
 class BrowserAutoCompleteSuggestionsAdapter(
     private val immediateSearchClickListener: (AutoCompleteSuggestion) -> Unit,
-    private val editableSearchClickListener: (AutoCompleteSuggestion) -> Unit,
-    private val showsMessageOnNoSuggestions: Boolean = true
-    ) : RecyclerView.Adapter<AutoCompleteViewHolder>() {
+    private val editableSearchClickListener: (AutoCompleteSuggestion) -> Unit
+) : RecyclerView.Adapter<AutoCompleteViewHolder>() {
 
     private val viewHolderFactoryMap: Map<Int, SuggestionViewHolderFactory> = mapOf(
         EMPTY_TYPE to EmptySuggestionViewHolderFactory(),
         SUGGESTION_TYPE to SearchSuggestionViewHolderFactory(),
         BOOKMARK_TYPE to BookmarkSuggestionViewHolderFactory()
     )
-    private val suggestions: MutableList<AutoCompleteSuggestion> = ArrayList()
+
+    private var phrase = ""
+    private var suggestions: List<AutoCompleteSuggestion> = emptyList()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AutoCompleteViewHolder =
         viewHolderFactoryMap.getValue(viewType).onCreateViewHolder(parent)
@@ -64,18 +65,17 @@ class BrowserAutoCompleteSuggestionsAdapter(
     }
 
     override fun getItemCount(): Int {
-        if (suggestions.isNotEmpty()) {
-            return suggestions.size
+        if (suggestions.isEmpty() && phrase.isNotBlank()) {
+            return 1 // No suggestions message
         }
-        return if (showsMessageOnNoSuggestions) 1 else 0
+        return suggestions.size
     }
 
     @UiThread
-    fun updateData(newSuggestions: List<AutoCompleteSuggestion>) {
-        if (suggestions == newSuggestions) return
-
-        suggestions.clear()
-        suggestions.addAll(newSuggestions)
+    fun updateData(newPhrase: String, newSuggestions: List<AutoCompleteSuggestion>) {
+        if (phrase == newPhrase && suggestions == newSuggestions) return
+        phrase = newPhrase
+        suggestions = newSuggestions
         notifyDataSetChanged()
     }
 

app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt

@@ -94,8 +94,7 @@ class SystemSearchActivity : DuckDuckGoActivity() {
             },
             editableSearchClickListener = {
                 viewModel.userUpdatedQuery(it.phrase)
-            },
-            showsMessageOnNoSuggestions = false
+            }
         )
         autocompleteSuggestions.adapter = autocompleteSuggestionsAdapter
     }
@@ -127,8 +126,8 @@ class SystemSearchActivity : DuckDuckGoActivity() {
             omnibarTextInput.setText(viewState.queryText)
             omnibarTextInput.setSelection(viewState.queryText.length)
         }
-        autocompleteSuggestionsAdapter.updateData(viewState.autocompleteResults)
         deviceLabel.isVisible = viewState.appResults.isNotEmpty()
+        autocompleteSuggestionsAdapter.updateData(viewState.autocompleteResults.query, viewState.autocompleteResults.suggestions)
         deviceAppSuggestionsAdapter.updateData(viewState.appResults)
     }
 

app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchViewModel.kt

@@ -38,7 +38,7 @@ class SystemSearchViewModel(
 
     data class SystemSearchViewState(
         val queryText: String = "",
-        val autocompleteResults: List<AutoCompleteApi.AutoCompleteSuggestion> = emptyList(),
+        val autocompleteResults: AutoCompleteApi.AutoCompleteResult = AutoCompleteApi.AutoCompleteResult("", emptyList()),
         val appResults: List<DeviceApp> = emptyList()
     )
 
@@ -52,7 +52,7 @@ class SystemSearchViewModel(
 
     private val autoCompletePublishSubject = PublishRelay.create<String>()
     private var appResults: List<DeviceApp> = emptyList()
-    private var autocompleteResults: List<AutoCompleteApi.AutoCompleteSuggestion> = emptyList()
+    private var autocompleteResults: AutoCompleteApi.AutoCompleteResult = AutoCompleteApi.AutoCompleteResult("", emptyList())
 
     init {
         resetState()
@@ -62,9 +62,9 @@ class SystemSearchViewModel(
     private fun currentViewState(): SystemSearchViewState = viewState.value!!
 
     fun resetState() {
-        autocompleteResults = emptyList()
-        appResults = emptyList()
         viewState.value = SystemSearchViewState()
+        autocompleteResults = AutoCompleteApi.AutoCompleteResult("", emptyList())
+        appResults = emptyList()
     }
 
     private fun configureAutoComplete() {
@@ -105,15 +105,15 @@ class SystemSearchViewModel(
     }
 
     private fun updateAutocompleteResult(results: AutoCompleteApi.AutoCompleteResult) {
-        autocompleteResults = results.suggestions
+        autocompleteResults = results
         refreshViewStateResults()
     }
 
     private fun refreshViewStateResults() {
-        val hasMultiResults = autocompleteResults.isNotEmpty() && appResults.isNotEmpty()
-        val newSuggestions = if (hasMultiResults) autocompleteResults.take(MULTI_RESULTS_MAX_PER_GROUP) else autocompleteResults
+        val hasMultiResults = autocompleteResults.suggestions.isNotEmpty() && appResults.isNotEmpty()
+        val newSuggestions = if (hasMultiResults) autocompleteResults.suggestions.take(MULTI_RESULTS_MAX_PER_GROUP) else autocompleteResults.suggestions
         val newApps = if (hasMultiResults) appResults.take(MULTI_RESULTS_MAX_PER_GROUP) else appResults
-        viewState.postValue(currentViewState().copy(autocompleteResults = newSuggestions, appResults = newApps))
+        viewState.postValue(currentViewState().copy(autocompleteResults = AutoCompleteApi.AutoCompleteResult(autocompleteResults.query, newSuggestions), appResults = newApps))
     }
 
     fun userClearedQuery() {

app/src/main/res/layout/fragment_browser_tab.xml

@@ -44,7 +44,6 @@
         android:backgroundTint="?attr/colorPrimary"
         android:clipToPadding="false"
         android:elevation="4dp"
-        android:paddingBottom="14dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/item_autocomplete_no_suggestions.xml

@@ -18,7 +18,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="8dp"
+    android:layout_marginBottom="22dp"
     android:layout_marginTop="8dp">
 
     <TextView