blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Merge #6024 

6024: For #5749 - Update string for ETP onboarding popup r=ekager a=BranescuMihai



Co-authored-by: Mihai Branescu <branescu.mihai2@gmail.com>
master
MozLando 2019-10-16 00:12:52 +00:00
parent a1f96a0ec7 1490c0178f
commit 610a70a8bc
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -355,7 +355,7 @@ class BrowserFragment : BaseBrowserFragment(), BackHandler {
val layout = LayoutInflater.from(it)
.inflate(R.layout.tracking_protection_onboarding_popup, null)
layout.onboarding_message.text =
it.getString(R.string.etp_onboarding_message, getString(R.string.app_name))
it.getString(R.string.etp_onboarding_message_2, getString(R.string.app_name))
val trackingOnboarding = PopupWindow(
layout,

2
app/src/main/res/layout/tracking_protection_onboarding_popup.xml
View File

@ -36,7 +36,7 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:lineSpacingExtra="2dp"
android:text="@string/etp_onboarding_message"
android:text="@string/etp_onboarding_message_2"
android:textColor="@color/primary_text_dark_theme"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/values/strings.xml
View File

@ -887,7 +887,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">When the shield changes colors, %s is blocking trackers on a website. Tap it open to see what’s being blocked.</string>
<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>
<!-- 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 -->