From e39e8350a12acabe19dcf8aae7cc9064665ce71c Mon Sep 17 00:00:00 2001 From: Bartosz Fabianowski Date: Tue, 21 Mar 2017 11:19:38 +0100 Subject: [PATCH] Finalize strings for enterprise privacy A few more final string tweaks for the enterprise privacy page. Bug: 32692748 Test: m RunSettingsRoboTests Change-Id: Icf91a1188febb303fb1a9e9a5259a06c3b2324da --- res/values/strings.xml | 31 +++++++------------ res/xml/enterprise_privacy_settings.xml | 1 + ...aCertsCurrentUserPreferenceController.java | 6 ++-- ...rtsManagedProfilePreferenceController.java | 2 -- ...tsCurrentUserPreferenceControllerTest.java | 28 ++++++----------- ...anagedProfilePreferenceControllerTest.java | 8 ----- 6 files changed, 25 insertions(+), 51 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 25207222402..4a85b8feec1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8227,13 +8227,13 @@ Apps installed - Apps allowed to access your location + Location permissions - Apps allowed to access your microphone + Microphone permissions - Apps allowed to access your camera + Camera permissions - Default apps set + Default apps Default keyboard @@ -8247,30 +8247,21 @@ Global HTTP proxy set - - Trusted CA certificate installed - Trusted CA certificates installed - + Trusted credentials - - Trusted CA certificate installed in your personal profile - Trusted CA certificates installed in your personal profile - + Trusted credentials in your personal profile - %d certificate - %d certificates + %d CA certificate + %d CA certificates - %d certificate. Tap to view. - %d certificates. Tap to view. + %d CA certificate. Tap to view. + %d CA certificates. Tap to view. - - Trusted CA Certificate installed in your work profile - Trusted CA Certificates installed in your work profile - + Trusted credentials in your work profile Admin can lock the device and reset password diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml index 68403c5e40e..1a08cda2c8a 100644 --- a/res/xml/enterprise_privacy_settings.xml +++ b/res/xml/enterprise_privacy_settings.xml @@ -94,6 +94,7 @@ settings:multiLine="true"/> diff --git a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java index c8ea5512a7f..1895e09f234 100644 --- a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java @@ -40,9 +40,9 @@ public class CaCertsCurrentUserPreferenceController extends PreferenceController preference.setVisible(false); return; } - preference.setTitle(mContext.getResources().getQuantityString( - mFeatureProvider.isInCompMode() ? R.plurals.enterprise_privacy_ca_certs_personal : - R.plurals.enterprise_privacy_ca_certs_user, certs)); + preference.setTitle(mFeatureProvider.isInCompMode() + ? R.string.enterprise_privacy_ca_certs_personal + : R.string.enterprise_privacy_ca_certs_user); preference.setSummary(mContext.getResources().getQuantityString( R.plurals.enterprise_privacy_number_ca_certs, certs, certs)); preference.setVisible(true); diff --git a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java index 33224ae2e76..cc0d4f68b06 100644 --- a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java +++ b/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java @@ -40,8 +40,6 @@ public class CaCertsManagedProfilePreferenceController extends PreferenceControl preference.setVisible(false); return; } - preference.setTitle(mContext.getResources().getQuantityString( - R.plurals.enterprise_privacy_ca_certs_work, certs)); preference.setSummary(mContext.getResources().getQuantityString( R.plurals.enterprise_privacy_number_ca_certs, certs, certs)); preference.setVisible(true); diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java index 3cd63bb7733..c8ffa7efce0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java @@ -43,10 +43,8 @@ import static org.mockito.Mockito.when; @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public final class CaCertsCurrentUserPreferenceControllerTest { - private final String INSTALLED_CERTS_USER_1 = "cert installed"; - private final String INSTALLED_CERTS_USER_10 = "certs installed"; - private final String INSTALLED_CERTS_PERSONAL_1 = "cert installed in personal profile"; - private final String INSTALLED_CERTS_PERSONAL_10 = "certs installed in personal profile"; + private final String INSTALLED_CERTS_USER = "trusted credentials"; + private final String INSTALLED_CERTS_PERSONAL = "trusted credentials in personal profile"; private final String NUMBER_INSTALLED_CERTS_1 = "1 cert"; private final String NUMBER_INSTALLED_CERTS_10 = "10 certs"; @@ -63,16 +61,10 @@ public final class CaCertsCurrentUserPreferenceControllerTest { mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext); mController = new CaCertsCurrentUserPreferenceController(mContext); - when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_ca_certs_user, - 1)).thenReturn(INSTALLED_CERTS_USER_1); - when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_ca_certs_user, - 10)).thenReturn(INSTALLED_CERTS_USER_10); - when(mContext.getResources().getQuantityString( - R.plurals.enterprise_privacy_ca_certs_personal, 1)) - .thenReturn(INSTALLED_CERTS_PERSONAL_1); - when(mContext.getResources().getQuantityString( - R.plurals.enterprise_privacy_ca_certs_personal, 10)) - .thenReturn(INSTALLED_CERTS_PERSONAL_10); + when(mContext.getString(R.string.enterprise_privacy_ca_certs_user)) + .thenReturn(INSTALLED_CERTS_USER); + when(mContext.getString(R.string.enterprise_privacy_ca_certs_personal)) + .thenReturn(INSTALLED_CERTS_PERSONAL); when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs, 1, 1)).thenReturn(NUMBER_INSTALLED_CERTS_1); when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs, @@ -95,7 +87,7 @@ public final class CaCertsCurrentUserPreferenceControllerTest { .getNumberOfOwnerInstalledCaCertsInCurrentUser()).thenReturn(1); mController.updateState(preference); assertThat(preference.isVisible()).isTrue(); - assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_USER_1); + assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_USER); assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_1); preference.setVisible(false); @@ -103,7 +95,7 @@ public final class CaCertsCurrentUserPreferenceControllerTest { .getNumberOfOwnerInstalledCaCertsInCurrentUser()).thenReturn(10); mController.updateState(preference); assertThat(preference.isVisible()).isTrue(); - assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_USER_10); + assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_USER); assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_10); when(mFeatureFactory.enterprisePrivacyFeatureProvider.isInCompMode()).thenReturn(true); @@ -117,7 +109,7 @@ public final class CaCertsCurrentUserPreferenceControllerTest { .getNumberOfOwnerInstalledCaCertsInCurrentUser()).thenReturn(1); mController.updateState(preference); assertThat(preference.isVisible()).isTrue(); - assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_PERSONAL_1); + assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_PERSONAL); assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_1); preference.setVisible(false); @@ -125,7 +117,7 @@ public final class CaCertsCurrentUserPreferenceControllerTest { .getNumberOfOwnerInstalledCaCertsInCurrentUser()).thenReturn(10); mController.updateState(preference); assertThat(preference.isVisible()).isTrue(); - assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_PERSONAL_10); + assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_PERSONAL); assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_10); } diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java index c66128b8a8f..693cfaea699 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java @@ -43,8 +43,6 @@ import static org.mockito.Mockito.when; @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public final class CaCertsManagedProfilePreferenceControllerTest { - private final String INSTALLED_CERTS_1 = "cert installed"; - private final String INSTALLED_CERTS_10 = "certs installed"; private final String NUMBER_INSTALLED_CERTS_1 = "1 cert"; private final String NUMBER_INSTALLED_CERTS_10 = "10 certs"; @@ -61,10 +59,6 @@ public final class CaCertsManagedProfilePreferenceControllerTest { mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext); mController = new CaCertsManagedProfilePreferenceController(mContext); - when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_ca_certs_work, - 1)).thenReturn(INSTALLED_CERTS_1); - when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_ca_certs_work, - 10)).thenReturn(INSTALLED_CERTS_10); when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs, 1, 1)).thenReturn(NUMBER_INSTALLED_CERTS_1); when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs, @@ -85,7 +79,6 @@ public final class CaCertsManagedProfilePreferenceControllerTest { .getNumberOfOwnerInstalledCaCertsInManagedProfile()).thenReturn(1); mController.updateState(preference); assertThat(preference.isVisible()).isTrue(); - assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_1); assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_1); preference.setVisible(false); @@ -93,7 +86,6 @@ public final class CaCertsManagedProfilePreferenceControllerTest { .getNumberOfOwnerInstalledCaCertsInManagedProfile()).thenReturn(10); mController.updateState(preference); assertThat(preference.isVisible()).isTrue(); - assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_10); assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_10); }