diff --git a/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt
index 09bf1c94a..b1127f2ce 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt
@@ -12,11 +12,9 @@ import android.os.Vibrator
import android.view.View
import androidx.core.content.ContextCompat
import androidx.core.content.getSystemService
-import androidx.core.text.HtmlCompat
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.NavHostFragment.findNavController
import androidx.navigation.fragment.findNavController
-import kotlinx.android.synthetic.main.fragment_pair.*
import mozilla.components.feature.qr.QrFeature
import mozilla.components.support.base.feature.UserInteractionHandler
import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
@@ -31,11 +29,6 @@ class PairFragment : Fragment(R.layout.fragment_pair), UserInteractionHandler {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- pairInstructions.text = HtmlCompat.fromHtml(
- getString(R.string.pair_instructions),
- HtmlCompat.FROM_HTML_MODE_LEGACY
- )
-
qrFeature.set(
QrFeature(
requireContext(),
@@ -64,7 +57,8 @@ class PairFragment : Fragment(R.layout.fragment_pair), UserInteractionHandler {
R.id.turnOnSyncFragment,
false
)
- }),
+ },
+ scanMessage = R.string.pair_instructions_2),
owner = this,
view = view
)
diff --git a/app/src/main/res/layout/fragment_pair.xml b/app/src/main/res/layout/fragment_pair.xml
index d71dc50fe..26dfae96c 100644
--- a/app/src/main/res/layout/fragment_pair.xml
+++ b/app/src/main/res/layout/fragment_pair.xml
@@ -1,23 +1,9 @@
-
-
-
-
-
-
+ android:layout_height="match_parent"
+ android:orientation="horizontal">
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9837d2dd6..ee4f0a8bd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -365,7 +365,7 @@
- firefox.com/pair in Firefox on your computer to get your QR code.]]>
+ firefox.com/pair]]>
Open Camera