blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #220 - Removes feature flag for language picker (#9191) 

* For #220 - Removes feature flag for language picker

* For #220 - Updates Android Components
master
Jeff Boek 2020-04-06 14:29:52 -07:00 committed by GitHub
parent 39791a9f42
commit c632b93ee7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
View File

@ -36,9 +36,9 @@ object FeatureFlags {
val dynamicBottomToolbar = Config.channel.isNightlyOrDebug val dynamicBottomToolbar = Config.channel.isNightlyOrDebug
/** /**
* Enables the new language picker * Enables deleting individual tracking protection exceptions.
*/ */
val fenixLanguagePicker = Config.channel.isNightlyOrDebug val deleteIndividualTrackingProtectionExceptions = Config.channel.isNightlyOrDebug
/** /**
* Integration of push support provided by `feature-push` component into the Gecko engine. * Integration of push support provided by `feature-push` component into the Gecko engine.

8
app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
View File

@ -31,7 +31,6 @@ import mozilla.components.concept.sync.OAuthAccount
import mozilla.components.concept.sync.Profile import mozilla.components.concept.sync.Profile
import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.Config import org.mozilla.fenix.Config
import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.Event
@ -116,7 +115,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.preferences, rootKey) setPreferencesFromResource(R.xml.preferences, rootKey)
updatePreferenceVisibilityForFeatureFlags()
} }
override fun onResume() { override fun onResume() {
@ -177,12 +175,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
} }
} }
private fun updatePreferenceVisibilityForFeatureFlags() {
findPreference<Preference>(getPreferenceKey(R.string.pref_key_language))?.apply {
isVisible = FeatureFlags.fenixLanguagePicker
}
}
@Suppress("ComplexMethod", "LongMethod") @Suppress("ComplexMethod", "LongMethod")
override fun onPreferenceTreeClick(preference: Preference): Boolean { override fun onPreferenceTreeClick(preference: Preference): Boolean {
// Hide the scrollbar so the animation looks smoother // Hide the scrollbar so the animation looks smoother

4
app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtension.kt
View File

@ -15,7 +15,7 @@ import java.util.Locale
*/ */
fun LocaleManager.getSupportedLocales(): List<Locale> { fun LocaleManager.getSupportedLocales(): List<Locale> {
val resultLocaleList: MutableList<Locale> = ArrayList() val resultLocaleList: MutableList<Locale> = ArrayList()
resultLocaleList.add(0, getSystemDefault() ?: Locale.getDefault()) resultLocaleList.add(0, getSystemDefault())
resultLocaleList.addAll(BuildConfig.SUPPORTED_LOCALE_ARRAY resultLocaleList.addAll(BuildConfig.SUPPORTED_LOCALE_ARRAY
.toList() .toList()
@ -37,7 +37,7 @@ fun LocaleManager.getSelectedLocale(
localeList: List<Locale> = getSupportedLocales() localeList: List<Locale> = getSupportedLocales()
): Locale { ): Locale {
val selectedLocale = getCurrentLocale(context)?.toLanguageTag() val selectedLocale = getCurrentLocale(context)?.toLanguageTag()
val defaultLocale = getSystemDefault() ?: Locale.getDefault() val defaultLocale = getSystemDefault()
return if (selectedLocale == null) { return if (selectedLocale == null) {
defaultLocale defaultLocale

2
buildSrc/src/main/java/AndroidComponents.kt
View File

@ -3,5 +3,5 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
object AndroidComponents { object AndroidComponents {
const val VERSION = "38.0.20200406130135" const val VERSION = "38.0.20200406190117"
} }