Commit 7348fce6 authored by Xing Liu's avatar Xing Liu Committed by Chromium LUCI CQ

Read later: Modify incognito NTP string to mention reading list.

Change incognito NTP string for reading list. Also uses \u2019 for
incognito ntp strings.

Bug: 1166785
Change-Id: I30d8d84e439b0f1ac09a7ca3dd03bb1a26564513
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2629462Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Reviewed-by: default avatarMin Qin <qinmin@chromium.org>
Commit-Queue: Xing Liu <xingliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844911}
parent 1b746faf
......@@ -27,6 +27,8 @@ import androidx.appcompat.widget.SwitchCompat;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.flags.CachedFeatureFlags;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.components.content_settings.CookieControlsEnforcement;
import org.chromium.ui.text.NoUnderlineClickableSpan;
import org.chromium.ui.text.SpanApplier;
......@@ -294,8 +296,10 @@ public class IncognitoDescriptionView extends LinearLayout {
/** Adjust the "Learn More" link. */
private void adjustLearnMore() {
final String subtitleText =
getContext().getResources().getString(R.string.new_tab_otr_subtitle);
boolean readLaterEnabled = CachedFeatureFlags.isEnabled(ChromeFeatureList.READ_LATER);
final String subtitleText = getContext().getResources().getString(readLaterEnabled
? R.string.new_tab_otr_subtitle_with_reading_list
: R.string.new_tab_otr_subtitle);
boolean learnMoreInSubtitle = mWidthDp > WIDE_LAYOUT_THRESHOLD_DP;
mLearnMore.setVisibility(learnMoreInSubtitle ? View.GONE : View.VISIBLE);
......
......@@ -144,13 +144,16 @@
<!-- TODO(msramek): Merge with the above section once this is fully launched. -->
<message name="IDS_NEW_TAB_OTR_TITLE" desc="Title of the Incognito new tab page. The Incognito mode provides private browsing experience by hiding browsing activity from other people using the same device. However, it does not make the user completely invisible or anonymous; please don't translate it as such." formatter_data="android_java">
You've gone incognito
Youve gone incognito
</message>
<message name="IDS_NEW_TAB_OTR_SUBTITLE" desc="Subtitle of the Incognito new tab page, explaining to the user that the Incognito mode hides their browsing activity from other people using the same device. The second sentence clarifies that there are two important exceptions from this rule - downloaded files and added bookmarks will be persisted even after the Incognito session is closed." formatter_data="android_java">
Now you can browse privately, and other people who use this device won't see your activity. However, downloads and bookmarks will be saved.
Now you can browse privately, and other people who use this device won’t see your activity. However, downloads and bookmarks will be saved.
</message>
<message name="IDS_NEW_TAB_OTR_SUBTITLE_WITH_READING_LIST" desc="Subtitle of the Incognito new tab page, explaining to the user that the Incognito mode hides their browsing activity from other people using the same device. The second sentence clarifies that there are two important exceptions from this rule - downloaded files and added bookmarks will be persisted even after the Incognito session is closed." formatter_data="android_java">
Now you can browse privately, and other people who use this device won’t see your activity. However, downloads, bookmarks and reading list items will be saved.
</message>
<message name="IDS_NEW_TAB_OTR_NOT_SAVED" desc="Bullet points listing data that are not saved in the Incognito mode. 'Browsing history' means a history of visited websites. 'Cookies and site data' refers to data saved by websites on the user's device (e.g. sign-in state, preferences, etc.). 'Information entered in forms' refers to names, addresses, passwords etc. that users enter into forms on the web." formatter_data="android_java">
Chrome <ph name="BEGIN_EMPHASIS">&lt;em&gt;</ph>won't save<ph name="END_EMPHASIS">&lt;/em&gt;</ph> the following information:
Chrome <ph name="BEGIN_EMPHASIS">&lt;em&gt;</ph>wont save<ph name="END_EMPHASIS">&lt;/em&gt;</ph> the following information:
<ph name="BEGIN_LIST">&lt;ul&gt;</ph>
<ph name="LIST_ITEM">&lt;li&gt;</ph>Your browsing history
<ph name="LIST_ITEM">&lt;li&gt;</ph>Cookies and site data
......
766f31860505ce1f7a2b6519d755e84a75bb8753
\ No newline at end of file
b5c8d16b9b12f88804743dd2f3aef2395006a05c
\ No newline at end of file
766f31860505ce1f7a2b6519d755e84a75bb8753
\ No newline at end of file
766f31860505ce1f7a2b6519d755e84a75bb8753
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment