From d2c3427f1edc4bc41685fbd8515b1c5959c3e7cb Mon Sep 17 00:00:00 2001 From: a79014 Date: Tue, 11 Jun 2019 22:40:51 +0100 Subject: [PATCH] Doesn't print gecko emoji on android ver < 7 (android N) (#3115) * Doesnt print gecko emoji on android ver < 7 * fixed typo on maybeGecko variable * Closes #3076: Lizard char now doesn't appear if not supported androidver * Closes #3115: Prints string instead of gecko emoji in unsupported android versions --- .../main/java/org/mozilla/fenix/settings/AboutFragment.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/AboutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/AboutFragment.kt index 21c269293..73cb46952 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/AboutFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/AboutFragment.kt @@ -27,10 +27,14 @@ class AboutFragment : Fragment() { val appName = requireContext().resources.getString(R.string.app_name) (activity as AppCompatActivity).title = getString(R.string.preferences_about, appName) + var maybeGecko = " \uD83E\uDD8E " + if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.N) { + maybeGecko = "GV: " + } val aboutText = try { val packageInfo = requireContext().packageManager.getPackageInfo(requireContext().packageName, 0) - val geckoVersion = PackageInfoCompat.getLongVersionCode(packageInfo).toString() + " \uD83E\uDD8E " + + val geckoVersion = PackageInfoCompat.getLongVersionCode(packageInfo).toString() + maybeGecko + GeckoViewBuildConfig.MOZ_APP_VERSION + "-" + GeckoViewBuildConfig.MOZ_APP_BUILDID String.format( "%s (Build #%s)",