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
commit
610a70a8bc
|
@ -355,7 +355,7 @@ class BrowserFragment : BaseBrowserFragment(), BackHandler {
|
||||||
val layout = LayoutInflater.from(it)
|
val layout = LayoutInflater.from(it)
|
||||||
.inflate(R.layout.tracking_protection_onboarding_popup, null)
|
.inflate(R.layout.tracking_protection_onboarding_popup, null)
|
||||||
layout.onboarding_message.text =
|
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(
|
val trackingOnboarding = PopupWindow(
|
||||||
layout,
|
layout,
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:lineSpacingExtra="2dp"
|
android:lineSpacingExtra="2dp"
|
||||||
android:text="@string/etp_onboarding_message"
|
android:text="@string/etp_onboarding_message_2"
|
||||||
android:textColor="@color/primary_text_dark_theme"
|
android:textColor="@color/primary_text_dark_theme"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
|
|
@ -887,7 +887,7 @@
|
||||||
<!-- Description of tracking content that can be blocked by Enhanced Tracking Protection -->
|
<!-- 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>
|
<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) -->
|
<!-- 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 -->
|
<!-- Enhanced Tracking Protection message that protection is currently on for this site -->
|
||||||
<string name="etp_panel_on">Protections are ON for this site</string>
|
<string name="etp_panel_on">Protections are ON for this site</string>
|
||||||
<!-- Enhanced Tracking Protection message that protection is currently off for this site -->
|
<!-- Enhanced Tracking Protection message that protection is currently off for this site -->
|
||||||
|
|
Loading…
Reference in New Issue