From 0d5fb67303574177a2f436f68e712ac3118ef7bb Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Wed, 6 Nov 2019 10:27:57 -0800 Subject: [PATCH] For #6284: Fixes SearchShortcut button functionality when in a session This makes it so searchShortcuts button works when going from browser -> search --- .../org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt index af0ffc0b4..0ff88e6e9 100644 --- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt +++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt @@ -180,14 +180,13 @@ class AwesomeBarView( fun update(state: SearchFragmentState) { updateSearchShortcutsIcon(state) + updateSuggestionProvidersVisibility(state) - // Do not make suggestions based on user's current URL - if (state.query == state.session?.url) { + // Do not make suggestions based on user's current URL unless it's a search shortcut + if (state.query == state.session?.url && !state.showSearchShortcuts) { return } - updateSuggestionProvidersVisibility(state) - view.onInputChanged(state.query) }