Merge "Show a different Root CA string for device owner" into nyc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 51c54c9..11bda60 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5318,7 +5318,12 @@
<item quantity="one">Trust or remove certificate</item>
<item quantity="other">Trust or remove certificates</item>
</plurals>
- <!-- Text of message to show to users whose administrator has installed a SSL CA Cert. [CHAR LIMIT=NONE] -->
+ <!-- Text of message to show to device owner user whose administrator has installed a SSL CA Cert. [CHAR LIMIT=NONE] -->
+ <plurals name="ssl_ca_cert_info_message_device_owner">
+ <item quantity="one"><xliff:g id="managing_domain">%s</xliff:g> has installed a certificate authority on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites. You can choose to either trust or remove this certificate.\n\nFor more information about this certificate, contact your admin.</item>
+ <item quantity="other"><xliff:g id="managing_domain">%s</xliff:g> has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites. You can choose to either trust or remove these certificates.\n\nFor more information about these certificates, contact your admin.</item>
+ </plurals>
+ <!-- Text of message to show to work profile users whose administrator has installed a SSL CA Cert. [CHAR LIMIT=NONE] -->
<plurals name="ssl_ca_cert_info_message">
<item quantity="one"><xliff:g id="managing_domain">%s</xliff:g> has installed a certificate authority for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites. You can choose to either trust or remove this certificate.\n\nFor more information about this certificate, contact your admin.</item>
<item quantity="other"><xliff:g id="managing_domain">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites. You can choose to either trust or remove these certificates.\n\nFor more information about these certificates, contact your admin.</item>
diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java
index 7bf5768..9df3413 100644
--- a/src/com/android/settings/MonitoringCertInfoActivity.java
+++ b/src/com/android/settings/MonitoringCertInfoActivity.java
@@ -57,8 +57,9 @@
builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message,
numberOfCertificates, dpm.getProfileOwnerName()));
} else if (dpm.getDeviceOwnerComponentOnCallingUser() != null) {
- builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message,
- numberOfCertificates, dpm.getDeviceOwnerNameOnAnyUser()));
+ builder.setMessage(getResources().getQuantityString(
+ R.plurals.ssl_ca_cert_info_message_device_owner, numberOfCertificates,
+ dpm.getDeviceOwnerNameOnAnyUser()));
} else {
// Consumer case. Show scary warning.
builder.setIcon(android.R.drawable.stat_notify_error);