From 412b412d5f6a220d62a6653a8134d6c1eeb7a221 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Fri, 16 Oct 2020 12:47:56 -0400 Subject: [PATCH] For #15796 - show device language under follow device language (#15966) --- .../org/mozilla/fenix/settings/advanced/LocaleViewHolders.kt | 2 +- .../mozilla/fenix/settings/advanced/LocaleViewHoldersTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleViewHolders.kt b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleViewHolders.kt index cb140ce18..7d72a58f8 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleViewHolders.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleViewHolders.kt @@ -39,7 +39,7 @@ class SystemLocaleViewHolder( override fun bind(locale: Locale) { locale_title_text.text = itemView.context.getString(R.string.default_locale_text) - locale_subtitle_text.visibility = View.GONE + locale_subtitle_text.text = locale.displayName.capitalize(Locale.getDefault()) locale_selected_icon.isVisible = isCurrentLocaleSelected(locale, isDefault = true) itemView.setOnClickListener { interactor.onDefaultLocaleSelected() diff --git a/app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleViewHoldersTest.kt b/app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleViewHoldersTest.kt index 4fe4f34b0..451d67a89 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleViewHoldersTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleViewHoldersTest.kt @@ -71,7 +71,7 @@ class LocaleViewHoldersTest { systemLocaleViewHolder.bind(selectedLocale) assertEquals("Follow device language", view.locale_title_text.text) - assertFalse(view.locale_subtitle_text.isVisible) + assertEquals("English (United States)", view.locale_subtitle_text.text) assertTrue(view.locale_selected_icon.isVisible) }