From 0a6881d4704032022425d94870b881c22599c2ee Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Fri, 7 Feb 2020 07:22:37 -0800 Subject: [PATCH] For #255: Removes autoplay media feature flag (#8198) --- app/src/main/java/org/mozilla/fenix/FeatureFlags.kt | 5 ----- .../sitepermissions/SitePermissionsFragment.kt | 13 ------------- .../main/java/org/mozilla/fenix/utils/Settings.kt | 4 +--- .../main/res/xml/site_permissions_preferences.xml | 3 +-- 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt index 7d992004f..c286ee61a 100644 --- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt +++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt @@ -24,11 +24,6 @@ object FeatureFlags { */ const val mediaIntegration = true - /** - * Gives option in Settings to disable auto play media - */ - val autoPlayMedia = Config.channel.isNightlyOrDebug - /** * Allows Progressive Web Apps to be installed to the device home screen. */ diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt index 9dc73d07b..d62eb6b28 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt @@ -9,7 +9,6 @@ import androidx.navigation.Navigation import androidx.preference.Preference import androidx.preference.Preference.OnPreferenceClickListener import androidx.preference.PreferenceFragmentCompat -import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.R import org.mozilla.fenix.ext.getPreferenceKey import org.mozilla.fenix.ext.settings @@ -36,18 +35,6 @@ class SitePermissionsFragment : PreferenceFragmentCompat() { private fun setupPreferences() { bindCategoryPhoneFeatures() bindExceptions() - - if (FeatureFlags.autoPlayMedia) { - displayAutoplayPreference() - } - } - - private fun displayAutoplayPreference() { - findPreference( - getPreferenceKey(R.string.pref_key_browser_feature_autoplay) - )?.apply { - isVisible = true - } } private fun bindExceptions() { diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index 30fd5af8b..9309379be 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -22,7 +22,6 @@ import mozilla.components.support.ktx.android.content.longPreference import mozilla.components.support.ktx.android.content.stringPreference import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.Config -import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.components.metrics.Event @@ -128,10 +127,9 @@ class Settings private constructor( default = true ) - // If autoPlayMedia is flagged OFF, default to true here val isAutoPlayEnabled = getSitePermissionsPhoneFeatureAction( PhoneFeature.AUTOPLAY, Action.BLOCKED - ) != Action.BLOCKED || !FeatureFlags.autoPlayMedia + ) != Action.BLOCKED private var trackingProtectionOnboardingShownThisSession = false diff --git a/app/src/main/res/xml/site_permissions_preferences.xml b/app/src/main/res/xml/site_permissions_preferences.xml index e54778d24..955288e13 100644 --- a/app/src/main/res/xml/site_permissions_preferences.xml +++ b/app/src/main/res/xml/site_permissions_preferences.xml @@ -9,8 +9,7 @@ android:icon="@drawable/ic_autoplay_enabled" android:key="@string/pref_key_browser_feature_autoplay" android:title="@string/preference_browser_feature_autoplay" - android:summary="@string/preference_option_autoplay_blocked" - app:isPreferenceVisible="false"/> + android:summary="@string/preference_option_autoplay_blocked"/>