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

For #25829 - String updates for Sync

Browse Source
This commit is contained in:
Alexandru2909 2022-06-30 14:30:39 +03:00 committed by mergify[bot]
parent 14ee00303b
commit beca81b442
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt
View File

@ -203,7 +203,7 @@ fun deleteBookmarkFolder() = onView(withText(R.string.bookmark_menu_delete_butto
fun tapOnTabCounter() = onView(withId(R.id.counter_text)).click()
fun settingsAccountPreferences() = onView(withText(R.string.preferences_sync)).click()
fun settingsAccountPreferences() = onView(withText(R.string.preferences_sync_2)).click()
fun settingsSearch() = onView(withText(R.string.preferences_search)).click()

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

@ -56,6 +56,6 @@ private fun assertTurnOnSyncToolbarTitle() =
onView(
allOf(
withParent(withId(R.id.navigationToolbar)),
withText("Turn on Sync")
withText(R.string.preferences_sync_2)
)
).check(matches(isDisplayed()))

2
app/src/main/java/org/mozilla/fenix/settings/account/TurnOnSyncFragment.kt
View File

@ -105,7 +105,7 @@ class TurnOnSyncFragment : Fragment(), AccountObserver {
pairWithEmailStarted = true
} else {
requireComponents.backgroundServices.accountManager.register(this, owner = this)
showToolbar(getString(R.string.preferences_sync))
showToolbar(getString(R.string.preferences_sync_2))
}
}

4
app/src/main/res/navigation/nav_graph.xml
View File

@ -757,7 +757,7 @@
<fragment
android:id="@+id/turnOnSyncFragment"
android:name="org.mozilla.fenix.settings.account.TurnOnSyncFragment"
android:label="@string/preferences_sync"
android:label="@string/preferences_sync_2"
tools:layout="@layout/fragment_turn_on_sync">
<argument
android:name="padSnackbar"
@ -771,7 +771,7 @@
<fragment
android:id="@+id/pairFragment"
android:name="org.mozilla.fenix.settings.PairFragment"
android:label="@string/preferences_sync"
android:label="@string/preferences_sync_2"
tools:layout="@layout/fragment_pair" />
<fragment

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

@ -341,7 +341,9 @@
<!-- Preference for settings related to visual options -->
<string name="preferences_customize">Customize</string>
<!-- Preference description for banner about signing in -->
<string name="preferences_sign_in_description">Sync bookmarks, history, and more with your Firefox Account</string>
<string name="preferences_sign_in_description" moz:RemovedIn="104" tools:ignore="UnusedResources">Sync bookmarks, history, and more with your Firefox Account</string>
<!-- Preference description for banner about signing in -->
<string name="preferences_sign_in_description_2">Sign in to sync tabs, bookmarks, passwords, and more.</string>
<!-- Preference shown instead of account display name while account profile information isn't available yet. -->
<string name="preferences_account_default_name">Firefox Account</string>
<!-- Preference text for account title when there was an error syncing FxA -->
@ -506,7 +508,9 @@
<!-- Turn On Sync Preferences -->
<!-- Header of the Turn on Sync preference view -->
<string name="preferences_sync">Turn on Sync</string>
<string name="preferences_sync" moz:RemovedIn="104" tools:ignore="UnusedResources">Turn on Sync</string>
<!-- Header of the Sync and save your data preference view -->
<string name="preferences_sync_2">Sync and save your data</string>
<!-- Preference for reconnecting to FxA sync -->
<string name="preferences_sync_sign_in_to_reconnect">Sign in to reconnect</string>
<!-- Preference for removing FxA account -->

4
app/src/main/res/xml/preferences.xml
View File

@ -9,8 +9,8 @@
<androidx.preference.Preference
android:key="@string/pref_key_sign_in"
android:layout="@layout/sign_in_preference"
android:summary="@string/preferences_sign_in_description"
android:title="@string/preferences_sync"
android:summary="@string/preferences_sign_in_description_2"
android:title="@string/preferences_sync_2"
app:allowDividerBelow="false" />
<androidx.preference.SwitchPreference