diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt index 086d08186b..695fac0d0d 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt @@ -285,14 +285,6 @@ class SmokeTest { }.goToSearchEngine { }.enterURLAndEnterToBrowser(defaultWebPage.url) { }.openTabDrawer { - }.openNewTab { - clickSearchEngineButton() - mDevice.waitForIdle() - changeDefaultSearchEngine("Twitter") - verifySearchEngineIcon("Twitter") - }.goToSearchEngine { - }.enterURLAndEnterToBrowser(defaultWebPage.url) { - }.openTabDrawer { }.openNewTab { clickSearchEngineButton() changeDefaultSearchEngine("Wikipedia") diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt index 942848e765..f25e144924 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt @@ -248,8 +248,6 @@ private fun assertSearchEngineList() { .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) onView(withText("DuckDuckGo")) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) - onView(withText("Twitter")) - .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) onView(withText("Wikipedia")) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt index 55c1dc3d69..13f9cd7950 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt @@ -64,8 +64,6 @@ private fun assertSearchEngineList() { .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) onView(withText("DuckDuckGo")) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) - onView(withText("Twitter")) - .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) onView(withText("Wikipedia")) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) onView(withText("Add search engine")) diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt index 7e6d7a8eae..226a034e43 100644 --- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt +++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt @@ -40,9 +40,4 @@ object FeatureFlags { * Enables downloads with external download managers. */ val externalDownloadManager = Config.channel.isNightlyOrDebug - - /** - * Enables viewing downloads in browser. - */ - val viewDownloads = Config.channel.isNightlyOrDebug } diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt index c1e6500acf..e3b7e9ed65 100644 --- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt +++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt @@ -164,9 +164,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider { } private fun restoreDownloads() { - if (FeatureFlags.viewDownloads) { - components.useCases.downloadUseCases.restoreDownloads() - } + components.useCases.downloadUseCases.restoreDownloads() } private fun initVisualCompletenessQueueAndQueueTasks() { diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt index ff549ffa26..bf41b9613e 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt @@ -24,7 +24,6 @@ import mozilla.components.browser.state.selector.findTab import mozilla.components.browser.state.store.BrowserStore import mozilla.components.concept.storage.BookmarksStorage import mozilla.components.support.ktx.android.content.getColorFromAttr -import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingMode @@ -181,7 +180,7 @@ class DefaultToolbarMenu( .syncedTabsInTabsTray val menuItems = listOfNotNull( - if (FeatureFlags.viewDownloads) downloadsItem else null, + downloadsItem, historyItem, bookmarksItem, if (syncedTabsInTabsTray) null else syncedTabs, diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt index 579e4bf95e..f9cf7ed2bb 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt @@ -21,7 +21,6 @@ import mozilla.components.concept.sync.AccountObserver import mozilla.components.concept.sync.AuthType import mozilla.components.concept.sync.OAuthAccount import mozilla.components.support.ktx.android.content.getColorFromAttr -import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.R import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.settings @@ -170,7 +169,7 @@ class HomeMenu( if (settings.syncedTabsInTabsTray) null else syncedTabsItem, bookmarksItem, historyItem, - if (FeatureFlags.viewDownloads) downloadsItem else null, + downloadsItem, BrowserMenuDivider(), addons, BrowserMenuDivider(), diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt index cb5dc5325b..3ba492b6d0 100644 --- 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 = "57.0.20200831130101" + const val VERSION = "57.0.0" }