Pin AC TO 57.0.0 and remove feature flag for view downloads (#14592)
* Update Android Components version to 57.0.0. * Remove feature flag for "View Downloads". * Update search enginer list from changes by #13452 Co-authored-by: Chenxia Liu <liuche@mozilla.com>
This commit is contained in:
parent
d762dea49d
commit
6f5e9bad26
|
@ -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")
|
||||
|
|
|
@ -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)))
|
||||
}
|
||||
|
|
|
@ -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"))
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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(),
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user