Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev

Browse Source
This commit is contained in:
Robin Lee
2015-01-08 22:31:35 +00:00
committed by Android (Google) Code Review
parent cb8d8e10b0 e53b7dd066
commit 2cc617b2ad
3 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
core/res/res/values/strings.xml
View File

@@ -344,10 +344,6 @@
i.e. "Network may be monitored". This says that an unknown party is doing the monitoring. i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
[CHAR LIMIT=100]--> [CHAR LIMIT=100]-->
<string name="ssl_ca_cert_noti_by_unknown">By an unknown third party</string> <string name="ssl_ca_cert_noti_by_unknown">By an unknown third party</string>
<!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
the monitoring. [CHAR LIMIT=100]-->
<string name="ssl_ca_cert_noti_by_administrator">By your work profile administrator</string>
<!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning", <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
i.e. "Network may be monitored". This indicates who is doing the monitoring. i.e. "Network may be monitored". This indicates who is doing the monitoring.
[CHAR LIMIT=100]--> [CHAR LIMIT=100]-->
@@ -3043,34 +3039,34 @@
<string name="autofill_region_ignored_re">province|region|other<!-- es -->|provincia<!-- pt-BR, pt-PT -->|bairro|suburb</string> <string name="autofill_region_ignored_re">province|region|other<!-- es -->|provincia<!-- pt-BR, pt-PT -->|bairro|suburb</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_company_re">company|business|organization|organisation|department<!-- de-DE -->|firma|firmenname<!-- es -->|empresa<!-- fr-FR -->|societe|société<!-- it-IT -->|ragione.?sociale<!-- ja-JP -->|会社<!-- ru -->|название.?компании<!-- zh-CN -->|单位|公司</string> <string name="autofill_company_re">company|business|organization|organisation|department<!-- de-DE -->|firma|firmenname<!-- es -->|empresa<!-- fr-FR -->|societe|société<!-- it-IT -->|ragione.?sociale<!-- ja-JP -->|会社<!-- ru -->|название.?компании<!-- zh-CN -->|单位|公司</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_address_line_1_re">address.?line|address1|addr1|street<!-- de-DE -->|strasse|straße|hausnummer|housenumber<!-- en-GB -->|house.?name<!-- es -->|direccion|dirección<!-- fr-FR -->|adresse<!-- it-IT -->|indirizzo<!-- ja-JP -->|住所1<!-- pt-BR, pt-PT -->|morada|endereço<!-- ru -->|Адрес<!-- zh-CN -->|地址</string> <string name="autofill_address_line_1_re">address.?line|address1|addr1|street<!-- de-DE -->|strasse|straße|hausnummer|housenumber<!-- en-GB -->|house.?name<!-- es -->|direccion|dirección<!-- fr-FR -->|adresse<!-- it-IT -->|indirizzo<!-- ja-JP -->|住所1<!-- pt-BR, pt-PT -->|morada|endereço<!-- ru -->|Адрес<!-- zh-CN -->|地址</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_address_line_1_label_re">address<!-- fr-FR -->|adresse<!-- it-IT -->|indirizzo<!-- ja-JP -->|住所<!-- zh-CN -->|地址</string> <string name="autofill_address_line_1_label_re">address<!-- fr-FR -->|adresse<!-- it-IT -->|indirizzo<!-- ja-JP -->|住所<!-- zh-CN -->|地址</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_address_line_2_re">address.?line2|address2|addr2|street|suite|unit<!-- de-DE -->|adresszusatz|ergänzende.?angaben<!-- es -->|direccion2|colonia|adicional<!-- fr-FR -->|addresssuppl|complementnom|appartement<!-- it-IT -->|indirizzo2<!-- ja-JP -->|住所2</string> <string name="autofill_address_line_2_re">address.?line2|address2|addr2|street|suite|unit<!-- de-DE -->|adresszusatz|ergänzende.?angaben<!-- es -->|direccion2|colonia|adicional<!-- fr-FR -->|addresssuppl|complementnom|appartement<!-- it-IT -->|indirizzo2<!-- ja-JP -->|住所2</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_address_line_3_re">address.?line3|address3|addr3|street|line3<!-- es -->|municipio<!-- fr-FR -->|batiment|residence<!-- it-IT -->|indirizzo3</string> <string name="autofill_address_line_3_re">address.?line3|address3|addr3|street|line3<!-- es -->|municipio<!-- fr-FR -->|batiment|residence<!-- it-IT -->|indirizzo3</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_country_re">country|location<!-- ja-JP -->|国<!-- zh-CN -->|国家</string> <string name="autofill_country_re">country|location<!-- ja-JP -->|国<!-- zh-CN -->|国家</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_zip_code_re">zip|postal|post code|pcode|^1z$<!-- de-DE -->|postleitzahl<!-- es -->|cp<!-- fr-FR -->|cdp<!-- it-IT -->|cap<!-- ja-JP -->|郵便番号<!-- pt-BR, pt-PT -->|codigo|codpos|cep<!-- ru -->|Почтовый.?Индекс<!--zh-CN -->|邮政编码|邮编<!-- zh-TW -->|郵遞區號</string> <string name="autofill_zip_code_re">zip|postal|post code|pcode|^1z$<!-- de-DE -->|postleitzahl<!-- es -->|cp<!-- fr-FR -->|cdp<!-- it-IT -->|cap<!-- ja-JP -->|郵便番号<!-- pt-BR, pt-PT -->|codigo|codpos|cep<!-- ru -->|Почтовый.?Индекс<!--zh-CN -->|邮政编码|邮编<!-- zh-TW -->|郵遞區號</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_zip_4_re">zip|^-$|post2<!-- pt-BR, pt-PT -->|codpos2</string> <string name="autofill_zip_4_re">zip|^-$|post2<!-- pt-BR, pt-PT -->|codpos2</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_city_re">city|town<!-- de-DE -->|ort|stadt<!-- en-AU -->|suburb<!-- es -->|ciudad|provincia|localidad|poblacion<!-- fr-FR -->|ville|commune<!-- it-IT -->|localita<!-- ja-JP -->|市区町村<!-- pt-BR, pt-PT -->|cidade<!-- ru -->|Город<!-- zh-CN -->|市<!-- zh-TW -->|分區</string> <string name="autofill_city_re">city|town<!-- de-DE -->|ort|stadt<!-- en-AU -->|suburb<!-- es -->|ciudad|provincia|localidad|poblacion<!-- fr-FR -->|ville|commune<!-- it-IT -->|localita<!-- ja-JP -->|市区町村<!-- pt-BR, pt-PT -->|cidade<!-- ru -->|Город<!-- zh-CN -->|市<!-- zh-TW -->|分區</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_state_re">state|county|region|province<!-- de-DE -->|land<!-- en-UK -->|county|principality<!-- ja-JP -->|都道府県<!-- pt-BR, pt-PT -->|estado|provincia<!-- ru -->|область<!-- zh-CN -->|省<!-- zh-TW -->|地區</string> <string name="autofill_state_re">state|county|region|province<!-- de-DE -->|land<!-- en-UK -->|county|principality<!-- ja-JP -->|都道府県<!-- pt-BR, pt-PT -->|estado|provincia<!-- ru -->|область<!-- zh-CN -->|省<!-- zh-TW -->|地區</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_address_type_same_as_re">same as</string> <string name="autofill_address_type_same_as_re">same as</string>
@@ -3085,20 +3081,20 @@
<string name="autofill_shipping_designator_re">ship</string> <string name="autofill_shipping_designator_re">ship</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_email_re">e.?mail<!-- ja-JP -->|メールアドレス<!-- ru -->|Электронной.?Почты<!-- zh-CN -->|邮件|邮箱<!-- zh-TW -->|電郵地址</string> <string name="autofill_email_re">e.?mail<!-- ja-JP -->|メールアドレス<!-- ru -->|Электронной.?Почты<!-- zh-CN -->|邮件|邮箱<!-- zh-TW -->|電郵地址</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_username_re">user.?name|user.?id<!-- de-DE -->|vollständiger.?name<!-- zh-CN -->|用户名</string> <string name="autofill_username_re">user.?name|user.?id<!-- de-DE -->|vollständiger.?name<!-- zh-CN -->|用户名</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_name_re">^name|full.?name|your.?name|customer.?name|firstandlastname<!-- es -->|nombre.*y.*apellidos<!-- fr-FR -->|^nom<!-- ja-JP -->|お名前|氏名<!-- pt-BR, pt-PT -->|^nome<!-- zh-CN -->|姓名</string> <string name="autofill_name_re">^name|full.?name|your.?name|customer.?name|firstandlastname<!-- es -->|nombre.*y.*apellidos<!-- fr-FR -->|^nom<!-- ja-JP -->|お名前|氏名<!-- pt-BR, pt-PT -->|^nome<!-- zh-CN -->|姓名</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_name_specific_re">^name<!-- fr-FR -->|^nom<!-- pt-BR, pt-PT -->|^nome</string> <string name="autofill_name_specific_re">^name<!-- fr-FR -->|^nom<!-- pt-BR, pt-PT -->|^nome</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_first_name_re">irst.*name|initials|fname|first$<!-- de-DE -->|vorname<!-- es -->|nombre<!-- fr-FR -->|forename|prénom|prenom<!-- ja-JP -->|名<!-- pt-BR, pt-PT -->|nome<!-- ru -->|Имя</string> <string name="autofill_first_name_re">irst.*name|initials|fname|first$<!-- de-DE -->|vorname<!-- es -->|nombre<!-- fr-FR -->|forename|prénom|prenom<!-- ja-JP -->|名<!-- pt-BR, pt-PT -->|nome<!-- ru -->|Имя</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_middle_initial_re">middle.*initial|m\\.i\\.|mi$</string> <string name="autofill_middle_initial_re">middle.*initial|m\\.i\\.|mi$</string>
@@ -3107,10 +3103,10 @@
<string name="autofill_middle_name_re">middle.*name|mname|middle$<!-- es -->|apellido.?materno|lastlastname</string> <string name="autofill_middle_name_re">middle.*name|mname|middle$<!-- es -->|apellido.?materno|lastlastname</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_last_name_re">last.*name|lname|surname|last$<!-- de-DE -->|nachname<!-- es -->|apellidos<!-- fr-FR -->|famille|^nom<!-- it-IT -->|cognome<!-- ja-JP -->|姓<!-- pt-BR, pt-PT -->|morada|apelidos|surename|sobrenome<!-- ru -->|Фамилия</string> <string name="autofill_last_name_re">last.*name|lname|surname|last$<!-- de-DE -->|nachname<!-- es -->|apellidos<!-- fr-FR -->|famille|^nom<!-- it-IT -->|cognome<!-- ja-JP -->|姓<!-- pt-BR, pt-PT -->|morada|apelidos|surename|sobrenome<!-- ru -->|Фамилия</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_phone_re">phone<!-- de-DE -->|telefonnummer<!-- es -->|telefono|teléfono<!-- fr-FR -->|telfixe<!-- ja-JP -->|電話<!-- pt-BR, pt-PT -->|telefone|telemovel<!-- ru -->|телефон<!-- zh-CN -->|电话</string> <string name="autofill_phone_re">phone<!-- de-DE -->|telefonnummer<!-- es -->|telefono|teléfono<!-- fr-FR -->|telfixe<!-- ja-JP -->|電話<!-- pt-BR, pt-PT -->|telefone|telemovel<!-- ru -->|телефон<!-- zh-CN -->|电话</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_area_code_re">area.*code|acode|area</string> <string name="autofill_area_code_re">area.*code|acode|area</string>
@@ -3125,7 +3121,7 @@
<string name="autofill_phone_extension_re">ext<!-- pt-BR, pt-PT -->|ramal</string> <string name="autofill_phone_extension_re">ext<!-- pt-BR, pt-PT -->|ramal</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_name_on_card_re">card.?holder|name.?on.?card|ccname|owner<!-- de-DE -->|karteninhaber<!-- es -->|nombre.*tarjeta<!-- fr-FR -->|nom.*carte<!-- it-IT -->|nome.*cart<!-- ja-JP -->|名前<!-- ru -->|Имя.*карты<!-- zh-CN -->|信用卡开户名|开户名|持卡人姓名<!-- zh-TW -->|持卡人姓名</string> <string name="autofill_name_on_card_re">card.?holder|name.?on.?card|ccname|owner<!-- de-DE -->|karteninhaber<!-- es -->|nombre.*tarjeta<!-- fr-FR -->|nom.*carte<!-- it-IT -->|nome.*cart<!-- ja-JP -->|名前<!-- ru -->|Имя.*карты<!-- zh-CN -->|信用卡开户名|开户名|持卡人姓名<!-- zh-TW -->|持卡人姓名</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_name_on_card_contextual_re">name</string> <string name="autofill_name_on_card_contextual_re">name</string>
@@ -3134,19 +3130,19 @@
<string name="autofill_card_cvc_re">verification|card identification|cvn|security code|cvv code|cvc</string> <string name="autofill_card_cvc_re">verification|card identification|cvn|security code|cvv code|cvc</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_card_number_re">number|card.?#|card.?no|ccnum<!-- de-DE -->|nummer<!-- es -->|credito|numero|número<!-- fr-FR -->|numéro<!-- ja-JP -->|カード番号<!-- ru -->|Номер.*карты<!-- zh-CN -->|信用卡号|信用卡号码<!-- zh-TW -->|信用卡卡號</string> <string name="autofill_card_number_re">number|card.?#|card.?no|ccnum<!-- de-DE -->|nummer<!-- es -->|credito|numero|número<!-- fr-FR -->|numéro<!-- ja-JP -->|カード番号<!-- ru -->|Номер.*карты<!-- zh-CN -->|信用卡号|信用卡号码<!-- zh-TW -->|信用卡卡號</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_expiration_month_re">expir|exp.*month|exp.*date|ccmonth<!-- de-DE -->|gueltig|gültig|monat<!-- es -->|fecha<!-- fr-FR -->|date.*exp<!-- it-IT -->|scadenza<!-- ja-JP -->|有効期限<!-- pt-BR, pt-PT -->|validade<!-- ru -->|Срок действия карты<!-- zh-CN -->|月</string> <string name="autofill_expiration_month_re">expir|exp.*month|exp.*date|ccmonth<!-- de-DE -->|gueltig|gültig|monat<!-- es -->|fecha<!-- fr-FR -->|date.*exp<!-- it-IT -->|scadenza<!-- ja-JP -->|有効期限<!-- pt-BR, pt-PT -->|validade<!-- ru -->|Срок действия карты<!-- zh-CN -->|月</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_expiration_date_re">exp|^/|year<!-- de-DE -->|ablaufdatum|gueltig|gültig|yahr<!-- es -->|fecha<!-- it-IT -->|scadenza<!-- ja-JP -->|有効期限<!-- pt-BR, pt-PT -->|validade<!-- ru -->|Срок действия карты<!-- zh-CN -->|å¹´|有效期</string> <string name="autofill_expiration_date_re">exp|^/|year<!-- de-DE -->|ablaufdatum|gueltig|gültig|yahr<!-- es -->|fecha<!-- it-IT -->|scadenza<!-- ja-JP -->|有効期限<!-- pt-BR, pt-PT -->|validade<!-- ru -->|Срок действия карты<!-- zh-CN -->|年|有效期</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_card_ignored_re">^card</string> <string name="autofill_card_ignored_re">^card</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_fax_re">fax<!-- fr-FR -->|télécopie|telecopie<!-- ja-JP -->|ファックス<!-- ru -->|факс<!-- zh-CN -->|传真<!-- zh-TW -->|傳真</string> <string name="autofill_fax_re">fax<!-- fr-FR -->|télécopie|telecopie<!-- ja-JP -->|ファックス<!-- ru -->|факс<!-- zh-CN -->|传真<!-- zh-TW -->|傳真</string>
<!-- Do not translate. Regex used by AutoFill. --> <!-- Do not translate. Regex used by AutoFill. -->
<string name="autofill_country_code_re">country.*code|ccode|_cc</string> <string name="autofill_country_code_re">country.*code|ccode|_cc</string>
@@ -3338,7 +3334,7 @@
It is also used by the home screen's search "widget". It should be short --> It is also used by the home screen's search "widget". It should be short -->
<string name="search_go">Search</string> <string name="search_go">Search</string>
<!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] --> <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
<string name="search_hint">Search…</string> <string name="search_hint">Search…</string>
<!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] --> <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
<string name="searchview_description_search">Search</string> <string name="searchview_description_search">Search</string>
<!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] --> <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
@@ -4811,9 +4807,9 @@
<!-- Printing --> <!-- Printing -->
<!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" --> <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
<string name="mediasize_iso_a0">ISO A0</string> <string name="mediasize_iso_a0">ISO A0</string>
<!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" --> <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
<string name="mediasize_iso_a1">ISO A1</string> <string name="mediasize_iso_a1">ISO A1</string>
<!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" --> <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
<string name="mediasize_iso_a2">ISO A2</string> <string name="mediasize_iso_a2">ISO A2</string>
@@ -4880,17 +4876,17 @@
<!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" --> <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
<string name="mediasize_iso_c10">ISO C10</string> <string name="mediasize_iso_c10">ISO C10</string>
<!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) --> <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
<string name="mediasize_na_letter">Letter</string> <string name="mediasize_na_letter">Letter</string>
<!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) --> <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
<string name="mediasize_na_gvrnmt_letter">Government Letter</string> <string name="mediasize_na_gvrnmt_letter">Government Letter</string>
<!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) --> <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
<string name="mediasize_na_legal">Legal</string> <string name="mediasize_na_legal">Legal</string>
<!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) --> <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
<string name="mediasize_na_junior_legal">Junior Legal</string> <string name="mediasize_na_junior_legal">Junior Legal</string>
<!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) --> <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
<string name="mediasize_na_ledger">Ledger</string> <string name="mediasize_na_ledger">Ledger</string>
<!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) --> <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
<string name="mediasize_na_tabloid">Tabloid</string> <string name="mediasize_na_tabloid">Tabloid</string>
<!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) --> <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
@@ -5113,7 +5109,7 @@
<string name="lock_to_app_unlock_password">Ask for password before unpinning</string> <string name="lock_to_app_unlock_password">Ask for password before unpinning</string>
<!-- [CHAR_LIMIT=NONE] Battery saver: Feature description --> <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
<string name="battery_saver_description">To help improve battery life, battery saver reduces your device’s performance and limits vibration, location services, and most background data. Email, messaging, and other apps that rely on syncing may not update unless you open them.\n\nBattery saver turns off automatically when your device is charging.</string> <string name="battery_saver_description">To help improve battery life, battery saver reduces your device’s performance and limits vibration, location services, and most background data. Email, messaging, and other apps that rely on syncing may not update unless you open them.\n\nBattery saver turns off automatically when your device is charging.</string>
<!-- [CHAR_LIMIT=NONE] Zen mode: Condition summary for built-in downtime condition, if active --> <!-- [CHAR_LIMIT=NONE] Zen mode: Condition summary for built-in downtime condition, if active -->
<string name="downtime_condition_summary">Until your downtime ends at <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g></string> <string name="downtime_condition_summary">Until your downtime ends at <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g></string>

1
core/res/res/values/symbols.xml
View File

@@ -1041,7 +1041,6 @@
<java-symbol type="string" name="write_fail_reason_cancelled" /> <java-symbol type="string" name="write_fail_reason_cancelled" />
<java-symbol type="string" name="write_fail_reason_cannot_write" /> <java-symbol type="string" name="write_fail_reason_cannot_write" />
<java-symbol type="string" name="ssl_ca_cert_noti_by_unknown" /> <java-symbol type="string" name="ssl_ca_cert_noti_by_unknown" />
<java-symbol type="string" name="ssl_ca_cert_noti_by_administrator" />
<java-symbol type="string" name="ssl_ca_cert_noti_managed" /> <java-symbol type="string" name="ssl_ca_cert_noti_managed" />
<java-symbol type="string" name="ssl_ca_cert_warning" /> <java-symbol type="string" name="ssl_ca_cert_warning" />
<java-symbol type="string" name="work_profile_deleted" /> <java-symbol type="string" name="work_profile_deleted" />

5
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -1694,10 +1694,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
int smallIconId; int smallIconId;
String contentText; String contentText;
final String ownerName = getDeviceOwnerName(); final String ownerName = getDeviceOwnerName();
if (isManagedProfile(userHandle.getIdentifier())) { if (ownerName != null) {
contentText = mContext.getString(R.string.ssl_ca_cert_noti_by_administrator);
smallIconId = R.drawable.stat_sys_certificate_info;
} else if (ownerName != null) {
contentText = mContext.getString(R.string.ssl_ca_cert_noti_managed, ownerName); contentText = mContext.getString(R.string.ssl_ca_cert_noti_managed, ownerName);
smallIconId = R.drawable.stat_sys_certificate_info; smallIconId = R.drawable.stat_sys_certificate_info;
} else { } else {