Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-17 15:26:23 +00:00
Code Issues Releases Wiki Activity

For #25721 - Remove 'Daylight' from the 'About Firefox' screen

Browse Source
This commit is contained in:
Alexandru2909 2022-06-23 14:25:20 +03:00 committed by mergify[bot]
parent fe0165a846
commit 4fc65b700a
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
View File

@ -17,7 +17,6 @@ import androidx.recyclerview.widget.DividerItemDecoration
import mozilla.components.service.glean.private.NoExtras import mozilla.components.service.glean.private.NoExtras
import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.BuildConfig
import org.mozilla.fenix.Config
import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.Events
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R import org.mozilla.fenix.R
@ -40,7 +39,6 @@ import org.mozilla.geckoview.BuildConfig as GeckoViewBuildConfig
*/ */
class AboutFragment : Fragment(), AboutPageListener { class AboutFragment : Fragment(), AboutPageListener {
private lateinit var headerAppName: String
private lateinit var appName: String private lateinit var appName: String
private var aboutPageAdapter: AboutPageAdapter? = AboutPageAdapter(this) private var aboutPageAdapter: AboutPageAdapter? = AboutPageAdapter(this)
private var _binding: FragmentAboutBinding? = null private var _binding: FragmentAboutBinding? = null
@ -54,8 +52,6 @@ class AboutFragment : Fragment(), AboutPageListener {
): View { ): View {
_binding = FragmentAboutBinding.inflate(inflater, container, false) _binding = FragmentAboutBinding.inflate(inflater, container, false)
appName = getString(R.string.app_name) appName = getString(R.string.app_name)
headerAppName =
if (Config.channel.isRelease) getString(R.string.daylight_app_name) else appName
return binding.root return binding.root
} }
@ -128,7 +124,7 @@ class AboutFragment : Fragment(), AboutPageListener {
"" ""
} }
val content = getString(R.string.about_content, headerAppName) val content = getString(R.string.about_content, appName)
val buildDate = BuildConfig.BUILD_DATE val buildDate = BuildConfig.BUILD_DATE
binding.aboutText.text = aboutText binding.aboutText.text = aboutText

3
app/src/main/res/values/static_strings.xml
View File

@ -52,9 +52,6 @@
<!-- Content description (not visible, for screen readers etc.) used to announce [LinkTextView]. --> <!-- Content description (not visible, for screen readers etc.) used to announce [LinkTextView]. -->
<string name="link_text_view_type_announcement" translatable="false">link</string> <string name="link_text_view_type_announcement" translatable="false">link</string>
<!-- Name of the application for about page -->
<string name="daylight_app_name" translatable="false">Firefox Daylight</string>
<!-- Secret debug info strings --> <!-- Secret debug info strings -->
<string name="debug_info_region_home" translatable="false">Home region</string> <string name="debug_info_region_home" translatable="false">Home region</string>
<string name="debug_info_region_current" translatable="false">Current region</string> <string name="debug_info_region_current" translatable="false">Current region</string>