From 03c174437dc75949974e8bf269c0e9ddaab06d22 Mon Sep 17 00:00:00 2001 From: Arturo Mejia Date: Mon, 25 Jan 2021 11:19:06 -0500 Subject: [PATCH] [fenix] Remove autoplay indicator FeatureFlags --- app/src/main/java/org/mozilla/fenix/FeatureFlags.kt | 5 ----- .../fenix/components/toolbar/ToolbarIntegration.kt | 13 ++++--------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt index 1b0da3f637..ff5f746b88 100644 --- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt +++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt @@ -52,11 +52,6 @@ object FeatureFlags { @Suppress("MayBeConst") val newMediaSessionApi = true - /** - * Enabled showing site permission indicators in the toolbars. - */ - val permissionIndicatorsToolbar = Config.channel.isNightlyOrDebug - /** * Enables experimental WebAuthn support. This implementation should never reach release! */ diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt index ce93b611cf..018bf6efb8 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt @@ -24,7 +24,6 @@ import mozilla.components.feature.toolbar.ToolbarPresenter import mozilla.components.lib.publicsuffixlist.PublicSuffixList import mozilla.components.support.base.feature.LifecycleAwareFeature import mozilla.components.support.ktx.android.view.hideKeyboard -import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.R import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.settings @@ -120,20 +119,16 @@ class DefaultToolbarIntegration( listOf( DisplayToolbar.Indicators.TRACKING_PROTECTION, DisplayToolbar.Indicators.SECURITY, - DisplayToolbar.Indicators.EMPTY + DisplayToolbar.Indicators.EMPTY, + DisplayToolbar.Indicators.HIGHLIGHT ) } else { listOf( DisplayToolbar.Indicators.SECURITY, - DisplayToolbar.Indicators.EMPTY + DisplayToolbar.Indicators.EMPTY, + DisplayToolbar.Indicators.HIGHLIGHT ) } - - if (FeatureFlags.permissionIndicatorsToolbar) { - toolbar.display.indicators += DisplayToolbar.Indicators.HIGHLIGHT - } - - toolbar.display.displayIndicatorSeparator = context.settings().shouldUseTrackingProtection toolbar.display.icons = toolbar.display.icons.copy(