Merge branch 'main' into issue-19956

mozilla-mobile · Aug 6, 2021 · e1ef3c9 · e1ef3c9
2 parents 96138f0 + 01555c2
commit e1ef3c9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt
@@ -25,9 +25,6 @@ class ShortcutsSuggestionProvider(
 ) : AwesomeBar.SuggestionProvider {
     override val id: String = UUID.randomUUID().toString()
 
-    override val shouldClearSuggestions: Boolean
-        get() = false
-
     private val settingsIcon by lazy {
         AppCompatResources.getDrawable(context, R.drawable.ic_settings)?.toBitmap()
     }

diff --git a/app/src/test/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProviderTest.kt b/app/src/test/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProviderTest.kt
@@ -19,7 +19,6 @@ import mozilla.components.browser.state.state.SearchState
 import mozilla.components.browser.state.store.BrowserStore
 import org.junit.After
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
 import org.junit.Before
 import org.junit.Test
 import org.mozilla.fenix.R
@@ -44,12 +43,6 @@ class ShortcutsSuggestionProviderTest {
         unmockkStatic(AppCompatResources::class)
     }
 
-    @Test
-    fun `should clear is always false`() {
-        val provider = ShortcutsSuggestionProvider(mockk(), mockk(), mockk(), mockk())
-        assertFalse(provider.shouldClearSuggestions)
-    }
-
     @Test
     fun `returns suggestions from search engine provider`() = runBlockingTest {
         val engineOne = mockk<SearchEngine> {

diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object AndroidComponents {
-    const val VERSION = "92.0.20210805225445"
+    const val VERSION = "92.0.20210806164329"
 }