update sync and backup screen

I purposefully did not flag the minor margin changes for the divider, I didn't think it was worth it.

sync/sync-impl/build.gradle

@@ -43,6 +43,7 @@ dependencies {
     implementation project(':navigation-api')
     implementation project(':remote-messaging-api')
     implementation project(path: ':autofill-api')
+    implementation project(path: ':settings-api') // temporary until we release new settings
 
     implementation project(path: ':app-build-config-api')
     implementation project(path: ':privacy-config-api')

sync/sync-impl/src/main/java/com/duckduckgo/sync/impl/ui/SyncActivity.kt

@@ -35,6 +35,7 @@ import com.duckduckgo.di.*
 import com.duckduckgo.di.scopes.*
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 import com.duckduckgo.navigation.api.getActivityParams
+import com.duckduckgo.settings.api.NewSettingsFeature
 import com.duckduckgo.sync.api.*
 import com.duckduckgo.sync.impl.ConnectedDevice
 import com.duckduckgo.sync.impl.PermissionRequest
@@ -120,6 +121,9 @@ class SyncActivity : DuckDuckGoActivity() {
     @Inject
     lateinit var syncFeatureMessagesPlugin: DaggerSet<SyncMessagePlugin>
 
+    @Inject
+    lateinit var newSettingsFeature: NewSettingsFeature
+
     private val syncIntroLauncher = registerForActivityResult(
         SyncIntroContract(),
     ) { resultOk ->
@@ -148,6 +152,11 @@ class SyncActivity : DuckDuckGoActivity() {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
         setupToolbar(binding.includeToolbar.toolbar)
+
+        if (newSettingsFeature.self().isEnabled()) {
+            binding.viewSyncDisabled.otherOptionsHeader.setText(R.string.sync_setup_other_options_title)
+        }
+
         observeUiEvents()
         registerForPermission()
         configureSettings()

sync/sync-impl/src/main/res/layout/view_sync_disabled.xml

@@ -50,9 +50,11 @@
 
     <com.duckduckgo.common.ui.view.divider.HorizontalDivider
         android:layout_width="match_parent"
+        android:layout_marginVertical="@dimen/keyline_2"
         android:layout_height="wrap_content" />
 
     <com.duckduckgo.common.ui.view.listitem.SectionHeaderListItem
+        android:id="@+id/otherOptionsHeader"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:primaryText="@string/sync_setup_single_device_title"/>
@@ -71,6 +73,7 @@
 
     <com.duckduckgo.common.ui.view.divider.HorizontalDivider
         android:layout_width="match_parent"
+        android:layout_marginVertical="@dimen/keyline_2"
         android:layout_height="wrap_content" />
 
     <com.duckduckgo.common.ui.view.listitem.OneLineListItem

sync/sync-impl/src/main/res/values/strings-sync.xml

@@ -16,7 +16,7 @@
 
 <!-- smartling.entity_escaping = false -->
 <!-- smartling.instruction_attributes = instruction -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Sync Disabled messages -->
     <string name="sync_flows_disabled"><b>Sync &amp; Backup Unavailable</b>\nSorry, but Sync &amp; Backup is currently unavailable. Please try again later.</string>
     <string name="sync_flows_disabled_new_version"><b>Sync &amp; Backup Unavailable</b>\nSorry, but Sync &amp; Backup is no longer available in this app version. Please update DuckDuckGo to the latest version to continue.</string>
@@ -36,6 +36,7 @@
     <string name="sync_setup_with_another_device_cta_subtitle">Securely sync bookmarks and passwords between your devices.</string>
     <string name="sync_off_hint">Your data is end-to-end encrypted, and DuckDuckGo does not have access to the encryption key.</string>
     <string name="sync_setup_single_device_title">Single-Device Setup</string>
+    <string name="sync_setup_other_options_title" tools:ignore="MissingTranslation">Other Options</string>
     <string name="sync_setup_single_recover_data_cta_title">Recover Synced Data</string>
     <string name="sync_setup_single_sync_this_device_cta_title">Sync and Back Up This Device</string>