From 21d3d0f8f0ebed7d592bef425236e195acb13e4c Mon Sep 17 00:00:00 2001
From: Alexandru2909 <aputanu@mozilla.com>
Date: Tue, 26 Jul 2022 16:01:28 +0300
Subject: [PATCH] For #26190 - Update jump back in cfr logic and message

---
 .../org/mozilla/fenix/onboarding/JumpBackInCFRDialog.kt     | 5 ++++-
 app/src/main/res/layout/onboarding_jump_back_in_cfr.xml     | 6 ++++--
 app/src/main/res/values/strings.xml                         | 4 +++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/JumpBackInCFRDialog.kt b/app/src/main/java/org/mozilla/fenix/onboarding/JumpBackInCFRDialog.kt
index fd9ec3d46..c03a2fb0a 100644
--- a/app/src/main/java/org/mozilla/fenix/onboarding/JumpBackInCFRDialog.kt
+++ b/app/src/main/java/org/mozilla/fenix/onboarding/JumpBackInCFRDialog.kt
@@ -50,6 +50,9 @@ class JumpBackInCFRDialog(val recyclerView: RecyclerView) {
 
     private fun createJumpCRF(anchor: View): Dialog? {
         val context: Context = recyclerView.context
+        if (!context.settings().showSyncCFR) {
+            context.settings().shouldShowJumpBackInCFR = false
+        }
         if (!context.settings().shouldShowJumpBackInCFR) {
             return null
         }
@@ -59,7 +62,7 @@ class JumpBackInCFRDialog(val recyclerView: RecyclerView) {
 
         popup.apply {
             setContentView(popupBinding.root)
-            setCancelable(false)
+            setCanceledOnTouchOutside(true)
             // removing title or setting it as an empty string does not prevent a11y services from assigning one
             setTitle(" ")
         }
diff --git a/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml b/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml
index 7396fafa6..9ad07cb18 100644
--- a/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml
+++ b/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml
@@ -6,6 +6,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingStart="12dp"
+    android:paddingEnd="12dp"
     android:orientation="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -22,8 +24,8 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="16dp"
-            android:maxWidth="200dp"
-            android:text="@string/onboarding_home_screen_jump_back_contextual_hint"
+            android:maxWidth="279dp"
+            android:text="@string/onboarding_home_screen_jump_back_contextual_hint_2"
             android:textAppearance="@style/Body16TextStyle"
             android:textColor="@color/fx_mobile_private_text_color_primary"
             android:textSize="16sp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a992a1252..836cb3c84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -264,7 +264,9 @@
     <!-- Onboarding home screen dialog description text for the history section. -->
     <string name="onboarding_home_screen_section_useful_history_description_2" moz:RemovedIn="106" tools:ignore="UnusedResources">Revisit your latest searches from your homepage and tabs.</string>
     <!-- Onboarding home screen popup dialog, shown on top of the Jump back in section. Firefox is intentionally hardcoded. -->
-    <string name="onboarding_home_screen_jump_back_contextual_hint">Your personalized Firefox homepage now makes it easier to pick up where you left off. Find your recent tabs, bookmarks, and search results.</string>
+    <string name="onboarding_home_screen_jump_back_contextual_hint" moz:RemovedIn="106" tools:ignore="UnusedResources">Your personalized Firefox homepage now makes it easier to pick up where you left off. Find your recent tabs, bookmarks, and search results.</string>
+    <!-- Onboarding home screen popup dialog, shown on top of the Jump back in section. -->
+    <string name="onboarding_home_screen_jump_back_contextual_hint_2">Meet your personalized homepage. Recent tabs, bookmarks, and search results will appear here.</string>
     <!-- Home onboarding dialog welcome screen title text. -->
     <string name="onboarding_home_welcome_title">Welcome to an independent internet</string>
     <!-- Home onboarding dialog welcome screen description text. -->