Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-02 03:40:16 +00:00
Code Issues Releases Wiki Activity

[fenix] Closes https://github.com/mozilla-mobile/fenix/issues/9928 - Updates private browsing text description

Browse Source
This commit is contained in:
ekager 2020-04-20 21:48:53 -07:00 committed by Mihai Adrian
parent 5c0d300938
commit 479c41236f
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
View File

@ -552,10 +552,10 @@ private fun assertPrivateSessionHeader() =
onView(allOf(withText("Private tabs"))) onView(allOf(withText("Private tabs")))
.check(matches(withEffectiveVisibility(Visibility.VISIBLE))) .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
const val PRIVATE_SESSION_MESSAGE = "Firefox Preview clears your search and browsing history " + const val PRIVATE_SESSION_MESSAGE =
"when you quit the app or close all private tabs. While this doesn’t make you anonymous to websites or " + "Firefox Preview clears your search and browsing history from private tabs when you close them or quit the app." +
"your internet service provider, it makes it easier to keep what you do online private from anyone else " + " While this doesn't make you anonymous to websites or your internet service provider," +
"who uses this device." " it makes it easier to keep what you do online from anyone else who uses this device."
private fun assertPrivateSessionMessage(visible: Boolean) = private fun assertPrivateSessionMessage(visible: Boolean) =
onView(allOf(withText(PRIVATE_SESSION_MESSAGE))) onView(allOf(withText(PRIVATE_SESSION_MESSAGE)))

2
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt
View File

@ -22,7 +22,7 @@ class PrivateBrowsingDescriptionViewHolder(
val resources = view.context.resources val resources = view.context.resources
val appName = resources.getString(R.string.app_name) val appName = resources.getString(R.string.app_name)
view.private_session_description.text = resources.getString( view.private_session_description.text = resources.getString(
R.string.private_browsing_placeholder_description, appName R.string.private_browsing_placeholder_description_2, appName
) )
val commonMythsText = view.private_session_common_myths.text.toString() val commonMythsText = view.private_session_common_myths.text.toString()
val textWithLink = SpannableString(commonMythsText).apply { val textWithLink = SpannableString(commonMythsText).apply {

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

@ -19,7 +19,7 @@
android:lineSpacingExtra="6dp" android:lineSpacingExtra="6dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:scrollHorizontally="false" android:scrollHorizontally="false"
tools:text="@string/private_browsing_placeholder_description" tools:text="@string/private_browsing_placeholder_description_2"
android:textColor="?primaryText" android:textColor="?primaryText"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView

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

@ -28,9 +28,8 @@
<string name="private_browsing_title">You’re in a private session</string> <string name="private_browsing_title">You’re in a private session</string>
<!-- Explanation for private browsing displayed to users on home view when they first enable private mode <!-- Explanation for private browsing displayed to users on home view when they first enable private mode
The first parameter is the name of the app defined in app_name (for example: Fenix) --> The first parameter is the name of the app defined in app_name (for example: Fenix) -->
<string name="private_browsing_placeholder_description"> <string name="private_browsing_placeholder_description_2">
%1$s clears your search and browsing history when you quit the app or close all private tabs. While this doesn’t make you anonymous to websites or your internet service provider, it makes it %1$s clears your search and browsing history from private tabs when you close them or quit the app. While this doesn\'t make you anonymous to websites or your internet service provider, it makes it easier to keep what you do online from anyone else who uses this device.
easier to keep what you do online private from anyone else who uses this device.
</string> </string>
<string name="private_browsing_common_myths"> <string name="private_browsing_common_myths">
Common myths about private browsing Common myths about private browsing