ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #27117 - Update copy for the menu from "Sign in to sync" to "Sync and save data"

This commit is contained in:
Sammy Khamis 2022-10-13 09:24:26 -10:00 committed by mergify[bot]
parent 1d4fc6aa36
commit b36ce9fd34
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordRobot.kt
View File

@ -110,5 +110,5 @@ private fun assertDefaultValueAutofillLogins(context: Context) = onView(
private fun assertDefaultValueExceptions() = onView(ViewMatchers.withText("Exceptions"))
.check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
private fun assertDefaultValueSyncLogins() = onView(ViewMatchers.withText("Sign in to Sync"))
private fun assertDefaultValueSyncLogins() = onView(ViewMatchers.withText("Sync and save data"))
.check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))

4
app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
View File

@ -173,7 +173,7 @@ class ThreeDotMenuMainRobot {
fun openSyncSignIn(interact: SyncSignInRobot.() -> Unit): SyncSignInRobot.Transition {
threeDotMenuRecyclerView().perform(swipeDown())
mDevice.waitNotNull(Until.findObject(By.text("Sign in to sync")), waitingTime)
mDevice.waitNotNull(Until.findObject(By.text("Sync and save data")), waitingTime)
signInToSyncButton().click()
SyncSignInRobot().interact()
@ -440,7 +440,7 @@ private fun bookmarksButton() = onView(allOf(withText(R.string.library_bookmarks
private fun assertBookmarksButton() = bookmarksButton()
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
private fun signInToSyncButton() = onView(withText("Sign in to sync"))
private fun signInToSyncButton() = onView(withText("Sync and save data"))
private fun assertSignInToSyncButton() = signInToSyncButton().check(matches(isDisplayed()))
private fun helpButton() = onView(allOf(withText(R.string.browser_menu_help)))

2
app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
View File

@ -352,7 +352,7 @@ open class DefaultToolbarMenu(
private fun syncMenuItem(): BrowserMenuImageText? {
val syncItemTitle =
if (context.components.backgroundServices.accountManagerAvailableQueue.isReady()) {
accountManager.accountProfileEmail ?: context.getString(R.string.sync_menu_sign_in)
accountManager.accountProfileEmail ?: context.getString(R.string.sync_menu_sync_and_save_data)
} else {
null
}

2
app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
View File

@ -100,7 +100,7 @@ class HomeMenu(
private fun syncSignInMenuItem(): BrowserMenuImageText? {
val syncItemTitle =
if (context.components.backgroundServices.accountManagerAvailableQueue.isReady()) {
accountManager.accountProfileEmail ?: context.getString(R.string.sync_menu_sign_in)
accountManager.accountProfileEmail ?: context.getString(R.string.sync_menu_sync_and_save_data)
} else {
null
}

4
app/src/main/res/values/strings.xml
View File

@ -1043,9 +1043,11 @@
<!-- Toast shown after copying link to clipboard -->
<string name="toast_copy_link_to_clipboard">Copied to clipboard</string>
<!-- An option from the three dot menu to into sync -->
<string name="sync_menu_sign_in">Sign in to sync</string>
<string name="sync_menu_sign_in" moz:removedIn="107" tools:ignore="UnusedResources">Sign in to sync</string>
<!-- An option from the share dialog to sign into sync -->
<string name="sync_sign_in">Sign in to Sync</string>
<!-- An option from the three dot menu to sync and save data -->
<string name="sync_menu_sync_and_save_data">Sync and save data</string>
<!-- An option from the share dialog to send link to all other sync devices -->
<string name="sync_send_to_all">Send to all devices</string>
<!-- An option from the share dialog to reconnect to sync -->