Skip to content

GitLab

T
tangled
Commit 10ba4f48 authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot
Browse files
Options

[Unity][Android] Update strings for non-personalized services 

This CL updates titles and summaries for non-personalized services in
UnifiedConsent Settings. It also adds an entry for url-keyed anonymized
data collection to this screen.

Bug: 814728
Change-Id: Ia83af10f57c7652cc7f4b58d9d9908be0b7e94cd
Reviewed-on: https://chromium-review.googlesource.com/1124457Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572313}
parent 20308970
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 20 deletions
chrome/android/java/res/xml/sync_and_services_preferences.xml
View file @ 10ba4f48
......@@ -27,15 +27,24 @@
android:summary="@string/prefs_nonpersonalized_services_section_summary">
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
android:key="navigation_error"
android:title="@string/navigation_error_title"
android:summary="@string/navigation_error_summary"
android:key="search_suggestions"
android:title="@string/autocomplete_searches_and_urls_title"
android:summary="@string/autocomplete_searches_and_urls_summary"
android:defaultValue="true"/>
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
android:key="search_suggestions"
android:title="@string/search_suggestions_title"
android:summary="@string/search_suggestions_summary"
android:key="network_predictions"
android:title="@string/preload_pages_title"
android:summary="@string/preload_pages_summary"
android:persistent="false"/>
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
android:key="navigation_error"
android:title="@string/navigation_error_suggestions_title"
android:summary="@string/navigation_error_suggestions_summary"
android:defaultValue="true"/>
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
android:key="safe_browsing"
android:title="@string/safe_browsing_title"
android:summary="@string/safe_browsing_summary"/>
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
android:key="safe_browsing_extended_reporting"
android:title="@string/safe_browsing_extended_reporting_title"
......@@ -44,19 +53,15 @@
android:key="safe_browsing_scout_reporting"
android:title="@string/safe_browsing_scout_reporting_title"
android:summary="@string/safe_browsing_scout_reporting_summary"/>
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
android:key="safe_browsing"
android:title="@string/safe_browsing_title"
android:summary="@string/safe_browsing_summary"/>
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
android:key="network_predictions"
android:title="@string/network_predictions_title"
android:summary="@string/network_predictions_summary"
android:persistent="false"/>
<org.chromium.chrome.browser.preferences.ChromeBasePreference
android:key="usage_and_crash_reports"
android:title="@string/usage_and_crash_reports_title"
android:fragment="org.chromium.chrome.browser.preferences.privacy.UsageAndCrashReportsPreferenceFragment"/>
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
android:key="url_keyed_anonymized_data"
android:title="@string/url_keyed_anonymized_data_title"
android:summary="@string/url_keyed_anonymized_data_summary"
android:persistent="false"/>
<org.chromium.chrome.browser.preferences.ChromeBasePreference
android:key="contextual_search"
android:title="@string/contextual_search_title"
......
chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncAndServicesPreferences.java
View file @ 10ba4f48
......@@ -16,7 +16,6 @@ import android.widget.ListView;
import org.chromium.base.metrics.RecordHistogram;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
import org.chromium.chrome.browser.help.HelpAndFeedback;
import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
......@@ -95,10 +94,6 @@ public class SyncAndServicesPreferences
mSearchSuggestions = (ChromeBaseCheckBoxPreference) findPreference(PREF_SEARCH_SUGGESTIONS);
mSearchSuggestions.setOnPreferenceChangeListener(this);
mSearchSuggestions.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
if (ChromeFeatureList.isEnabled(ChromeFeatureList.CONTENT_SUGGESTIONS_SETTINGS)) {
mSearchSuggestions.setTitle(R.string.search_site_suggestions_title);
mSearchSuggestions.setSummary(R.string.search_site_suggestions_summary);
}
mContextualSearch = findPreference(PREF_CONTEXTUAL_SEARCH);
if (!ContextualSearchFieldTrial.isEnabled()) {
......
chrome/android/java/strings/android_chrome_strings.grd
View file @ 10ba4f48
......@@ -325,6 +325,30 @@ CHAR-LIMIT guidelines:
<message name="IDS_PREFS_NONPERSONALIZED_SERVICES_SECTION_SUMMARY" desc="Summary for the expandable group of preferences that control non-personalized Google services. This group contains preferences for data that is not tied to user's Google Account.">
Communicates with Google to improve browsing and Chrome
</message>
<message name="IDS_AUTOCOMPLETE_SEARCHES_AND_URLS_TITLE" desc="Title for a checkbox in Settings that controls URL and search autocompletion and informs the user about the data shared by this feature.">
Autocomplete searches and URLs
</message>
<message name="IDS_AUTOCOMPLETE_SEARCHES_AND_URLS_SUMMARY" desc="Summary for a checkbox in Settings that controls URL and search autocompletion and informs the user about the data shared by this feature.">
Sends searches from the address bar and search box, and some cookies to your default search engine
</message>
<message name="IDS_PRELOAD_PAGES_TITLE" desc="Title for a checkbox in Settings that controls pages preloading and informs the user about the data shared by this feature.">
Preload pages for faster browsing and searching
</message>
<message name="IDS_PRELOAD_PAGES_SUMMARY" desc="Summary for a checkbox in Settings that controls pages preloading and informs the user about the data shared by this feature.">
Uses cookies to remember your preferences, even if you don't visit those pages
</message>
<message name="IDS_NAVIGATION_ERROR_SUGGESTIONS_TITLE" desc="Title for a checkbox in Settings that controls pages suggestions on navigation errors and informs the user about the data shared by this feature.">
Shows suggestions for similar pages when a page can't be found
</message>
<message name="IDS_NAVIGATION_ERROR_SUGGESTIONS_SUMMARY" desc="Summary for a checkbox in Settings that controls pages suggestions on navigation errors and informs the user about the data shared by this feature.">
Sends the URL of a page you're trying to reach to Google
</message>
<message name="IDS_URL_KEYED_ANONYMIZED_DATA_TITLE" desc="Title for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
Make searches and browsing better
</message>
<message name="IDS_URL_KEYED_ANONYMIZED_DATA_SUMMARY" desc="Summary for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
Sends URLs of pages you visit to Google
</message>
<!-- Search engine preferences -->
<message name="IDS_PREFS_SEARCH_ENGINE" desc="Title for Search Engine preferences. [CHAR-LIMIT=32]">
......
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