From c15469595d268d1e3ab1ce2d8b3bcf40f8920f57 Mon Sep 17 00:00:00 2001
From: Josh Vocal <joshvocal@gmail.com>
Date: Sun, 12 Jan 2020 08:45:37 -0500
Subject: [PATCH] For #7554: Add App Services Version to About Page

---
 .../org/mozilla/fenix/settings/about/AboutFragment.kt     | 8 ++++++--
 app/src/main/res/values/static_strings.xml                | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
index 0d7f08db8..4109e3f95 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
@@ -74,14 +74,18 @@ class AboutFragment : Fragment(), AboutPageListener {
             val componentsVersion = mozilla.components.Build.version + ", " + mozilla.components.Build.gitHash
             val maybeGecko = getString(R.string.gecko_view_abbreviation)
             val geckoVersion = GeckoViewBuildConfig.MOZ_APP_VERSION + "-" + GeckoViewBuildConfig.MOZ_APP_BUILDID
+            val appServicesAbbreviation = getString(R.string.app_services_abbreviation)
+            val appServicesVersion = mozilla.components.Build.applicationServicesVersion
 
             String.format(
-                "%s (Build #%s)\n%s\n%s: %s",
+                "%s (Build #%s)\n%s\n%s: %s\n%s: %s",
                 packageInfo.versionName,
                 versionCode,
                 componentsVersion,
                 maybeGecko,
-                geckoVersion
+                geckoVersion,
+                appServicesAbbreviation,
+                appServicesVersion
             )
         } catch (e: PackageManager.NameNotFoundException) {
             ""
diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml
index 95d6cfca2..0c0bbdd06 100644
--- a/app/src/main/res/values/static_strings.xml
+++ b/app/src/main/res/values/static_strings.xml
@@ -30,4 +30,6 @@
     <string name="default_top_site_wikipedia" translatable="false">Wikipedia</string>
     <!-- Default title for pinned YouTube top site that links to Youtube home page  -->
     <string name="default_top_site_youtube" translatable="false">YouTube</string>
+    <!-- Application Services abbreviation used in AboutFragment -->
+    <string name="app_services_abbreviation" translatable="false">AS</string>
 </resources>