For #26190 - Update jump back in cfr logic and message

pull/543/head
Alexandru2909 2 years ago committed by mergify[bot]
parent 1c77d8a978
commit 21d3d0f8f0

@ -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(" ")
}

@ -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"

@ -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. -->

Loading…
Cancel
Save