diff options
| author | Pankaj Garg <pgarg@codeaurora.org> | 2015-07-16 15:22:37 -0700 |
|---|---|---|
| committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-08-28 13:15:46 +0200 |
| commit | dbdf5aac9750c9cd918be04763480cae48a8b0a0 (patch) | |
| tree | 4e69bf05286cd2194886fa8102b48b8e6de8aba8 /res | |
| parent | e9c5a163a6ec0b10c32fb571ee3062f88e961c5b (diff) | |
| download | android_packages_apps_Gello-dbdf5aac9750c9cd918be04763480cae48a8b0a0.tar.gz android_packages_apps_Gello-dbdf5aac9750c9cd918be04763480cae48a8b0a0.tar.bz2 android_packages_apps_Gello-dbdf5aac9750c9cd918be04763480cae48a8b0a0.zip | |
WebRefiner UX changes
- Reworded the message shown in site specific
settings.
Change-Id: I39cce5e6386f38018d6cbfc0b785cf295f1dcb55
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 22 | ||||
| -rw-r--r-- | res/xml/privacy_and_security_preferences.xml | 1 | ||||
| -rw-r--r-- | res/xml/site_specific_preferences.xml | 2 |
3 files changed, 22 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index a4cce68e..17c22084 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -406,8 +406,26 @@ <string name="pref_web_refiner_enabled">Web Refiner</string> <!-- Settings summary for the WebRefiner --> <string name="pref_web_refiner_enabled_summary">Block advertisements and tracking</string> - <string name="pref_web_refiner_blocked">Blocked</string> - <string name="pref_web_refiner_advertisements">distractions</string> + <plurals name="pref_web_refiner_advertisements"> + <item quantity="one">%d advertisement</item> + <item quantity="other">%d advertisements</item> + </plurals> + <plurals name="pref_web_refiner_trackers"> + <item quantity="one">%d tracker</item> + <item quantity="other">%d trackers</item> + </plurals> + <plurals name="pref_web_refiner_malware"> + <item quantity="one">%d malware threat</item> + <item quantity="other">%d malware threats</item> + </plurals> + <string-array name="pref_web_refiner_message"> + <item>"Blocked %s. "</item> + <item>"Blocked %1$s and %2$s. "</item> + <item>"Blocked %1$s, %2$s and $3$s. "</item> + </string-array> + <string name="pref_valid_cert">Site has a valid SSL certificate.</string> + <string name="pref_invalid_cert">Site has an invalid SSL certificate.</string> + <string name="pref_warning_cert">Site SSL certificate has warnings.</string> <!-- Label for option that when clicked opens the AutoFill settings screen. Also used as the title of that AutoFill Settings screen. [CHAR-LIMIT=32] --> <string name="pref_autofill_profile_editor">Auto-fill text</string> <!-- Summary for the AutoFill Settings preference [CHAR-LIMIT=none] --> diff --git a/res/xml/privacy_and_security_preferences.xml b/res/xml/privacy_and_security_preferences.xml index 45e80f24..89c40a91 100644 --- a/res/xml/privacy_and_security_preferences.xml +++ b/res/xml/privacy_and_security_preferences.xml @@ -125,6 +125,7 @@ </PreferenceCategory> <PreferenceCategory + android:key="default_site_settings" android:layout="@layout/swe_preference_category" android:title="@string/pref_default_site_settings_title"> <SwitchPreference diff --git a/res/xml/site_specific_preferences.xml b/res/xml/site_specific_preferences.xml index 836bb349..0df94467 100644 --- a/res/xml/site_specific_preferences.xml +++ b/res/xml/site_specific_preferences.xml @@ -54,7 +54,7 @@ <PreferenceCategory android:title="@string/pref_site_settings_title" android:layout="@layout/swe_preference_category" - android:key="reset_default"> + android:key="site_pref_list"> <SwitchPreference android:layout="@layout/swe_preference" |