diff --git a/res/values/strings.xml b/res/values/strings.xml
index eb273107459..c96b5749f9d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8235,16 +8235,6 @@
Data associated with your work account, such as email and calendar
List of apps on your device
-
-
- - %d app
- - %d apps
-
-
-
- - %d app. Tap to view.
- - %d apps. Tap to view.
-
Time and data spent in each app on your device
@@ -8257,6 +8247,11 @@
None
Apps installed
+
+
+ - Minimum %d app
+ - Minimum %d apps
+
Location permissions
@@ -8265,6 +8260,11 @@
Camera permissions
Default apps
+
+
+ - %d app
+ - %d apps
+
Default keyboard
@@ -8279,15 +8279,10 @@
Global HTTP proxy set
Trusted credentials
-
+
- - %d CA certificate
- - %d CA certificates
-
-
-
- - %d CA certificate. Tap to view.
- - %d CA certificates. Tap to view.
+ - Minimum %d CA certificate
+ - Minimum %d CA certificates
Admin can lock the device and reset password
diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
index c60d7e0c69b..0db9e15319c 100644
--- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
@@ -53,7 +53,8 @@ public abstract class AdminGrantedPermissionsPreferenceControllerBase
} else {
preference.setVisible(true);
preference.setSummary(mContext.getResources().getQuantityString(
- R.plurals.enterprise_privacy_number_packages_actionable, num, num));
+ R.plurals.enterprise_privacy_number_packages_lower_bound,
+ num, num));
}
});
}
diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
index 93c1909148f..e70396d3c8a 100644
--- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
@@ -50,7 +50,8 @@ public class EnterpriseInstalledPackagesPreferenceController
} else {
preference.setVisible(true);
preference.setSummary(mContext.getResources().getQuantityString(
- R.plurals.enterprise_privacy_number_packages, num, num));
+ R.plurals.enterprise_privacy_number_packages_lower_bound, num,
+ num));
}
});
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
index 69e6237713d..f001bd1e73f 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
@@ -93,10 +93,10 @@ public abstract class AdminGrantedPermissionsPreferenceControllerTestBase {
setNumberOfPackagesWithAdminGrantedPermissions(20, true /* async */);
when(mContext.getResources().getQuantityString(
- R.plurals.enterprise_privacy_number_packages_actionable,20, 20))
- .thenReturn("20 packages");
+ R.plurals.enterprise_privacy_number_packages_lower_bound, 20, 20))
+ .thenReturn("minimum 20 apps");
mController.updateState(preference);
- assertThat(preference.getSummary()).isEqualTo("20 packages");
+ assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");
assertThat(preference.isVisible()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
index 98d0fa696d4..ff884e4474d 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
@@ -87,10 +87,11 @@ public final class EnterpriseInstalledPackagesPreferenceControllerTest {
assertThat(preference.isVisible()).isFalse();
setNumberOfEnterpriseInstalledPackages(20, true /* async */);
- when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_packages,
- 20, 20)).thenReturn("20 packages");
+ when(mContext.getResources().getQuantityString(
+ R.plurals.enterprise_privacy_number_packages_lower_bound, 20, 20))
+ .thenReturn("minimum 20 apps");
mController.updateState(preference);
- assertThat(preference.getSummary()).isEqualTo("20 packages");
+ assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");
assertThat(preference.isVisible()).isTrue();
}