update SystemSearchActivity to reuse installed apps suggestions (#6968)

Task/Issue URL:
https://app.asana.com/1/137249556945/project/1208671518894266/task/1211704100686772?focus=true

### Description
Removes the code that populated the installed apps search suggestions in
the `SystemSearchActivity` and instead takes the suggestions directly
from the autocomplete results.

### Steps to test this PR
- [x] Ensure that Search & Duck.ai is disabled (Settings -> AI
Features).
- [x] Add a widget (regular or favorites, **not** search-only) to the
home screen.
- [x] Click on the widget, verify that the input activity opens.
- [x] Search for apps on your device and verify they show up.
- [x] Verify that you see "Ask Duck.ai" at the bottom of suggestions
list.
- [x] Add a search-only widget to the home screen.
- [x] Click on the widget, verify that the input activity opens.
- [x] Search for apps on your device and verify they show up.
- [x] Verify that you **don't see** "Ask Duck.ai" at the bottom of
suggestions list.

Author: LukasPaczos

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

@@ -136,7 +136,6 @@ class SystemSearchActivity : DuckDuckGoActivity() {
     private val viewModel: SystemSearchViewModel by bindViewModel()
     private val binding: ActivitySystemSearchBinding by viewBinding()
     private lateinit var autocompleteSuggestionsAdapter: BrowserAutoCompleteSuggestionsAdapter
-    private lateinit var deviceAppSuggestionsAdapter: DeviceAppSuggestionsAdapter
     private lateinit var quickAccessAdapter: FavoritesQuickAccessAdapter
     private lateinit var itemTouchHelper: ItemTouchHelper
 
@@ -211,7 +210,6 @@ class SystemSearchActivity : DuckDuckGoActivity() {
         configureFlowCollectors()
         configureOnboarding()
         configureAutoComplete()
-        configureDeviceAppSuggestions()
         configureDaxButton()
         configureTextInput()
         configureQuickAccessGrid()
@@ -376,15 +374,6 @@ class SystemSearchActivity : DuckDuckGoActivity() {
         )
     }
 
-    private fun configureDeviceAppSuggestions() {
-        binding.deviceAppSuggestions.layoutManager = LinearLayoutManager(this)
-        deviceAppSuggestionsAdapter =
-            DeviceAppSuggestionsAdapter {
-                viewModel.userSelectedApp(it)
-            }
-        binding.deviceAppSuggestions.adapter = deviceAppSuggestionsAdapter
-    }
-
     private fun configureQuickAccessGrid() {
         val quickAccessRecyclerView = binding.quickAccessRecyclerView
         val numOfColumns = gridViewColumnCalculator.calculateNumberOfColumns(QUICK_ACCESS_ITEM_MAX_SIZE_DP, QUICK_ACCESS_GRID_MAX_COLUMNS)
@@ -495,11 +484,8 @@ class SystemSearchActivity : DuckDuckGoActivity() {
         if (viewState.autocompleteResults.suggestions.isEmpty()) {
             viewModel.autoCompleteSuggestionsGone()
         }
-        deviceAppSuggestionsAdapter.updateData(viewState.appResults)
 
         binding.autocompleteSuggestions.isVisible = !viewState.autocompleteResults.suggestions.isEmpty()
-        binding.listDivider.isVisible = viewState.appResults.isNotEmpty()
-        binding.deviceAppSuggestions.isVisible = !viewState.appResults.isEmpty()
     }
 
     private fun renderOmnibarState(viewState: SystemSearchViewModel.OmnibarViewState) {
@@ -694,10 +680,10 @@ class SystemSearchActivity : DuckDuckGoActivity() {
 
     private fun launchDeviceApp(command: LaunchDeviceApplication) {
         try {
-            startActivity(command.deviceApp.launchIntent)
+            startActivity(command.deviceAppSuggestion.launchIntent)
             finish()
         } catch (error: ActivityNotFoundException) {
-            viewModel.appNotFound(command.deviceApp)
+            viewModel.appNotFound(command.deviceAppSuggestion)
         }
     }
 

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

@@ -37,6 +37,7 @@ import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteSuggesti
 import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteSuggestion.AutoCompleteHistoryRelatedSuggestion.AutoCompleteHistorySuggestion
 import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteSuggestion.AutoCompleteHistoryRelatedSuggestion.AutoCompleteInAppMessageSuggestion
 import com.duckduckgo.browser.api.autocomplete.AutoComplete.AutoCompleteSuggestion.AutoCompleteUrlSuggestion.AutoCompleteSwitchToTabSuggestion
+import com.duckduckgo.browser.api.autocomplete.AutoCompleteFactory
 import com.duckduckgo.browser.api.autocomplete.AutoCompleteSettings
 import com.duckduckgo.browser.ui.omnibar.OmnibarPosition
 import com.duckduckgo.common.utils.DispatcherProvider
@@ -55,7 +56,6 @@ import com.duckduckgo.voice.api.VoiceSearchAvailability
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -67,6 +67,7 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -76,19 +77,13 @@ import logcat.asLog
 import logcat.logcat
 import javax.inject.Inject
 
-data class SystemSearchResult(
-    val autocomplete: AutoCompleteResult,
-    val deviceApps: List<DeviceApp>,
-)
-
 @ContributesViewModel(ActivityScope::class)
 class SystemSearchViewModel @Inject constructor(
     private val duckAiFeatureState: DuckAiFeatureState,
     private val voiceSearchAvailability: VoiceSearchAvailability,
     private val duckChat: DuckChat,
     private var userStageStore: UserStageStore,
-    private val autoComplete: AutoComplete,
-    private val deviceAppLookup: DeviceAppLookup,
+    autoCompleteFactory: AutoCompleteFactory,
     private val pixel: Pixel,
     private val savedSitesRepository: SavedSitesRepository,
     private val appSettingsPreferencesStore: SettingsDataStore,
@@ -116,7 +111,6 @@ class SystemSearchViewModel @Inject constructor(
     sealed class Suggestions {
         data class SystemSearchResultsViewState(
             val autocompleteResults: AutoCompleteResult = AutoCompleteResult("", emptyList()),
-            val appResults: List<DeviceApp> = emptyList(),
         ) : Suggestions()
 
         data class QuickAccessItems(
@@ -155,7 +149,7 @@ class SystemSearchViewModel @Inject constructor(
         ) : Command()
 
         data class LaunchDeviceApplication(
-            val deviceApp: DeviceApp,
+            val deviceAppSuggestion: AutoCompleteSuggestion.AutoCompleteDeviceAppSuggestion,
         ) : Command()
 
         data class ShowAppNotFoundMessage(
@@ -191,17 +185,33 @@ class SystemSearchViewModel @Inject constructor(
     private var hasUserSeenHistory = false
     private var omnibarPosition: OmnibarPosition = appSettingsPreferencesStore.omnibarPosition
 
+    private val autoComplete: AutoComplete = autoCompleteFactory.create(
+        AutoComplete.Config(showInstalledApps = true),
+    )
+
     @OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class)
     val suggestionsViewState =
         combine(queryFlow, refreshTrigger) { query, _ -> query.trim() }
             .debounce(DEBOUNCE_TIME_MS)
             .distinctUntilChanged()
             .flatMapLatest { query ->
-                buildResultsFlow(query)
+                autoComplete.autoComplete(query)
             }.flowOn(dispatchers.io())
             .catch { t: Throwable? -> logcat(WARN) { "Failed to get search results: ${t?.asLog()}" } }
-            .map { results ->
-                updateResults(results)
+            .onEach { results ->
+                if (results.suggestions.contains(AutoCompleteInAppMessageSuggestion)) {
+                    hasUserSeenHistory = true
+                }
+            }
+            .map {
+                val result = it.copy(
+                    suggestions = if (isSearchOnly.value) {
+                        it.suggestions.filterNot { suggestion -> suggestion is AutoCompleteSuggestion.AutoCompleteDuckAIPrompt }
+                    } else {
+                        it.suggestions
+                    },
+                )
+                Suggestions.SystemSearchResultsViewState(autocompleteResults = result)
             }.stateIn(viewModelScope, SharingStarted.Lazily, Suggestions.SystemSearchResultsViewState())
 
     val favoritesViewState =
@@ -235,7 +245,6 @@ class SystemSearchViewModel @Inject constructor(
 
     init {
         resetViewState()
-        refreshAppList()
     }
 
     fun setLaunchedFromSearchOnlyWidget(launchedFromSearchOnlyWidget: Boolean) {
@@ -264,17 +273,6 @@ class SystemSearchViewModel @Inject constructor(
         }
     }
 
-    private fun buildResultsFlow(query: String): Flow<SystemSearchResult> =
-        combine(
-            autoComplete.autoComplete(query),
-            flow { emit(deviceAppLookup.query(query)) },
-        ) { autocompleteResult, appsResult ->
-            if (autocompleteResult.suggestions.contains(AutoCompleteInAppMessageSuggestion)) {
-                hasUserSeenHistory = true
-            }
-            SystemSearchResult(autocompleteResult, appsResult)
-        }
-
     fun onOmnibarConfigured(position: OmnibarPosition) {
         omnibarPosition = position
     }
@@ -323,19 +321,6 @@ class SystemSearchViewModel @Inject constructor(
         }
     }
 
-    private fun updateResults(results: SystemSearchResult): Suggestions.SystemSearchResultsViewState {
-        val suggestions = results.autocomplete.suggestions
-        val appResults = results.deviceApps
-        val hasMultiResults = suggestions.isNotEmpty() && appResults.isNotEmpty()
-
-        val updatedSuggestions = if (hasMultiResults) suggestions.take(RESULTS_MAX_RESULTS_PER_GROUP) else suggestions
-        val updatedApps = if (hasMultiResults) appResults.take(RESULTS_MAX_RESULTS_PER_GROUP) else appResults
-        return Suggestions.SystemSearchResultsViewState(
-            autocompleteResults = AutoCompleteResult(results.autocomplete.query, updatedSuggestions),
-            appResults = updatedApps,
-        )
-    }
-
     private fun inputCleared() {
         queryFlow.update { "" }
     }
@@ -369,15 +354,20 @@ class SystemSearchViewModel @Inject constructor(
         when (suggestion) {
             is AutoCompleteSwitchToTabSuggestion -> {
                 command.value = Command.LaunchBrowserAndSwitchToTab(suggestion.phrase, suggestion.tabId)
+                pixel.fire(INTERSTITIAL_LAUNCH_BROWSER_QUERY)
             }
             is AutoCompleteSuggestion.AutoCompleteDuckAIPrompt -> {
                 onDuckAiRequested(suggestion.phrase)
             }
+            is AutoCompleteSuggestion.AutoCompleteDeviceAppSuggestion -> {
+                command.value = Command.LaunchDeviceApplication(deviceAppSuggestion = suggestion)
+                pixel.fire(INTERSTITIAL_LAUNCH_DEVICE_APP)
+            }
             else -> {
                 command.value = Command.LaunchBrowser(suggestion.phrase)
+                pixel.fire(INTERSTITIAL_LAUNCH_BROWSER_QUERY)
             }
         }
-        pixel.fire(INTERSTITIAL_LAUNCH_BROWSER_QUERY)
     }
 
     fun userLongPressedAutocomplete(suggestion: AutoCompleteSuggestion) {
@@ -418,21 +408,8 @@ class SystemSearchViewModel @Inject constructor(
         }
     }
 
-    fun userSelectedApp(app: DeviceApp) {
-        command.value = Command.LaunchDeviceApplication(app)
-        pixel.fire(INTERSTITIAL_LAUNCH_DEVICE_APP)
-    }
-
-    fun appNotFound(app: DeviceApp) {
-        command.value = Command.ShowAppNotFoundMessage(app.shortName)
-
-        refreshAppList()
-    }
-
-    private fun refreshAppList() {
-        viewModelScope.launch(dispatchers.io()) {
-            deviceAppLookup.refreshAppList()
-        }
+    fun appNotFound(deviceAppSuggestion: AutoCompleteSuggestion.AutoCompleteDeviceAppSuggestion) {
+        command.value = Command.ShowAppNotFoundMessage(deviceAppSuggestion.shortName)
     }
 
     fun onQuickAccessListChanged(newList: List<FavoritesQuickAccessAdapter.QuickAccessFavorite>) {
@@ -462,7 +439,6 @@ class SystemSearchViewModel @Inject constructor(
 
     companion object {
         private const val DEBOUNCE_TIME_MS = 200L
-        private const val RESULTS_MAX_RESULTS_PER_GROUP = 4
     }
 
     override fun onFavouriteEdited(favorite: Favorite) {

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

@@ -251,30 +251,6 @@
                     tools:itemCount="4"
                     tools:listitem="@layout/item_autocomplete_search_suggestion" />
 
-                <View
-                    android:id="@+id/listDivider"
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:background="?attr/daxColorShade"
-                    android:layout_marginVertical="@dimen/keyline_2"
-                    android:visibility="gone"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/autocompleteSuggestions"
-                    app:layout_constraintBottom_toTopOf="@id/deviceAppSuggestions"/>
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/deviceAppSuggestions"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/keyline_2"
-                    android:overScrollMode="never"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/listDivider"
-                    tools:itemCount="4"
-                    tools:listitem="@layout/item_device_app_suggestion" />
-
                 <include
                     android:id="@+id/includeSystemSearchOnboarding"
                     layout="@layout/include_system_search_onboarding" />

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

@@ -30,7 +30,7 @@
     android:visibility="gone"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@id/deviceAppSuggestions"
+    app:layout_constraintTop_toBottomOf="@id/autocompleteSuggestions"
     tools:context="com.duckduckgo.app.systemsearch.SystemSearchActivity"
     tools:visibility="visible">