From 512aa46224fdd3520ca87a2d7ec81a31d6af6423 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Fri, 5 Jun 2020 11:34:06 +0300
Subject: [PATCH] For #11229: Update ETP cfr string and behaviour.

---
 .../trackingprotection/TrackingProtectionOverlay.kt    | 10 +++++++++-
 .../layout/tracking_protection_onboarding_popup.xml    |  2 +-
 app/src/main/res/values/strings.xml                    |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt
index 8060c668f..9edace5ec 100644
--- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt
+++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt
@@ -15,6 +15,7 @@ import android.widget.ImageView
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.marginTop
+import kotlinx.android.synthetic.main.tracking_protection_onboarding_popup.*
 import kotlinx.android.synthetic.main.tracking_protection_onboarding_popup.view.*
 import mozilla.components.browser.session.Session
 import org.mozilla.fenix.R
@@ -55,7 +56,7 @@ class TrackingProtectionOverlay(
 
         layout.onboarding_message.text =
             context.getString(
-                R.string.etp_onboarding_message_2,
+                R.string.etp_onboarding_cfr_message,
                 context.getString(R.string.app_name)
             )
 
@@ -97,6 +98,13 @@ class TrackingProtectionOverlay(
             it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
         }
 
+        val etpShield =
+            getToolbar().findViewById<View>(R.id.mozac_browser_toolbar_tracking_protection_indicator)
+        trackingOnboardingDialog.message.setOnClickListener {
+            trackingOnboardingDialog.dismiss()
+            etpShield.performClick()
+        }
+
         trackingOnboardingDialog.show()
         settings.incrementTrackingProtectionOnboardingCount()
     }
diff --git a/app/src/main/res/layout/tracking_protection_onboarding_popup.xml b/app/src/main/res/layout/tracking_protection_onboarding_popup.xml
index 8c85b7b10..06767c384 100644
--- a/app/src/main/res/layout/tracking_protection_onboarding_popup.xml
+++ b/app/src/main/res/layout/tracking_protection_onboarding_popup.xml
@@ -48,7 +48,7 @@
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
             android:lineSpacingExtra="2dp"
-            android:text="@string/etp_onboarding_message_2"
+            android:text="@string/etp_onboarding_cfr_message"
             android:textColor="@color/primary_text_dark_theme"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 01b2d6f0d..a17ccce1d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1098,7 +1098,7 @@
     <!-- Description of tracking content that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_tracking_content_description">Stops outside ads, videos, and other content from loading that contains tracking code. May affect some website functionality.</string>
     <!-- Enhanced Tracking Protection Onboarding Message shown in a dialog above the toolbar. The first parameter is the name of the application (For example: Fenix) -->
-    <string name="etp_onboarding_message_2">%s is blocking trackers on this site when the shield is purple. Tap it to see what’s blocked.</string>
+    <string name="etp_onboarding_cfr_message">Every time the shield is purple, %s has blocked trackers on a site. Tap for more info.</string>
     <!-- Enhanced Tracking Protection message that protection is currently on for this site -->
     <string name="etp_panel_on">Protections are ON for this site</string>
     <!-- Enhanced Tracking Protection message that protection is currently off for this site -->