diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index 152bcbb08..77ad05f06 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -148,8 +148,13 @@ class DefaultBrowserToolbarController(
}
activity.getRootView()?.let {
+
+ val appName = it.context.getString(R.string.app_name)
FenixSnackbar.makeWithToolbarPadding(it, Snackbar.LENGTH_SHORT)
- .setText(it.context.getString(R.string.snackbar_added_to_firefox_home))
+ .setText(it.context.getString(
+ R.string.snackbar_added_to_firefox_home,
+ appName
+ ))
.show()
}
}
diff --git a/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt b/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt
index 76819d6b2..ca2da1fab 100644
--- a/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt
@@ -40,11 +40,21 @@ class MigrationProgressActivity : AbstractMigrationProgressActivity() {
}
fun init() {
+ val appName = migration_description.context.getString(R.string.app_name)
+
+ migration_description.apply {
+ text = context.getString(R.string.migration_description, appName)
+ }
+
migration_status_list.apply {
layoutManager = LinearLayoutManager(this@MigrationProgressActivity)
adapter = statusAdapter
}
+ migration_welcome_title.apply {
+ text = context.getString(R.string.migration_title, appName)
+ }
+
migration_button.apply {
setOnClickListener {
finish()
@@ -56,10 +66,7 @@ class MigrationProgressActivity : AbstractMigrationProgressActivity() {
startActivity(intent)
}
}
- text = getString(
- R.string.migration_updating_app_button_text,
- getString(R.string.app_name)
- )
+ text = getString(R.string.migration_updating_app_button_text, appName)
}
}
diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsView.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsView.kt
index 5835d0044..b19eafab5 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsView.kt
@@ -58,6 +58,14 @@ class SavedLoginsView(
text = textWithLink
setOnClickListener { interactor.onLearnMore() }
}
+
+ with(view.saved_passwords_empty_message) {
+ val appName = context.getString(R.string.app_name)
+ text = context.getString(
+ R.string.preferences_passwords_saved_logins_description_empty_text,
+ appName
+ )
+ }
}
fun update(state: SavedLoginsFragmentState) {
diff --git a/app/src/main/res/layout/activity_migration.xml b/app/src/main/res/layout/activity_migration.xml
index 5aa10192c..8df5caede 100644
--- a/app/src/main/res/layout/activity_migration.xml
+++ b/app/src/main/res/layout/activity_migration.xml
@@ -21,7 +21,7 @@
android:id="@+id/migration_firefox_logo"
android:layout_width="67dp"
android:layout_height="67dp"
- android:contentDescription="@string/firefox_logo_description"
+ android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_firefox" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 272fc04aa..7688faf4f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -702,8 +702,8 @@
Tab closed
Tabs closed
-
- Added to Firefox home!
+
+ Added to %s home!
Private tab closed
@@ -1046,8 +1046,8 @@
Sign in to Sync
Saved logins
-
- The logins you save or sync to Firefox will show up here.
+
+ The logins you save or sync to %s will show up here.
Learn more about Sync.
@@ -1156,17 +1156,15 @@
Deleted %s
-
- Firefox logo
-
- Welcome to an all-new Firefox
-
- A completely redesigned browser awaits, with improved performance and features to help you do more online.\n\nPlease wait while we update Firefox with your
-
+
+ Welcome to an all-new %s
+
+ A completely redesigned browser awaits, with improved performance and features to help you do more online.\n\nPlease wait while we update %s with your
+
Updating %s…
-
+
Start %s
-
+
Migration status: %s
@@ -1191,7 +1189,7 @@
Phone Feature
No Decision
-
+
1. Go to Android Settings
2. Tap Permissions
3. Toggle %1$s to ON
]]>