diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2cf7b551fc3..4ca68a60553 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1306,6 +1306,9 @@
Device admin apps
+
+ No active apps
+
- %d active app
@@ -8170,7 +8173,7 @@
- Managed device details
+ Managed device info
Changes & settings managed by your organization
@@ -8231,13 +8234,13 @@
Global HTTP proxy set
- - Trusted CA Certificate installed
- - Trusted CA Certificates installed
+ - Trusted CA certificate installed
+ - Trusted CA certificates installed
- - Trusted CA Certificate installed in your personal profile
- - Trusted CA Certificates installed in your personal profile
+ - Trusted CA certificate installed in your personal profile
+ - Trusted CA certificates installed in your personal profile
diff --git a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
index 55937ecebb7..6317afe5f95 100644
--- a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
+++ b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
@@ -36,8 +36,10 @@ public class ManageDeviceAdminPreferenceController extends PreferenceController
public void updateState(Preference preference) {
final int activeAdmins
= mFeatureProvider.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile();
- preference.setSummary(mContext.getResources().getQuantityString(
- R.plurals.number_of_device_admins, activeAdmins, activeAdmins));
+ preference.setSummary(activeAdmins == 0
+ ? mContext.getResources().getString(R.string.number_of_device_admins_none)
+ : mContext.getResources().getQuantityString(R.plurals.number_of_device_admins,
+ activeAdmins, activeAdmins));
}
@Override
diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
index 5cb637703e0..d3f5e97bc54 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
@@ -61,6 +61,13 @@ public final class ManageDeviceAdminPreferenceControllerTest {
public void testUpdateState() {
final Preference preference = new Preference(mContext, null, 0, 0);
+ when(mFeatureFactory.enterprisePrivacyFeatureProvider
+ .getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile()).thenReturn(0);
+ when(mContext.getResources().getString(R.string.number_of_device_admins_none))
+ .thenReturn("no apps");
+ mController.updateState(preference);
+ assertThat(preference.getSummary()).isEqualTo("no apps");
+
when(mFeatureFactory.enterprisePrivacyFeatureProvider
.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile()).thenReturn(5);
when(mContext.getResources().getQuantityString(R.plurals.number_of_device_admins, 5, 5))