From a112226db22f47587a814d1891b2ce137c62b2d5 Mon Sep 17 00:00:00 2001 From: Lenka Trochtova Date: Fri, 23 Mar 2018 16:08:28 +0100 Subject: [PATCH] Enterprice privacy: let the user know if admin enabled backups. Bug: 73750212 Bug: 64012357 Test: make RunSettingsGoogleRoboTests Change-Id: I586eaccaebb89a8b3e5b4014b3d6427ab2eb15a9 --- res/xml/enterprise_privacy_settings.xml | 3 + .../BackupsEnabledPreferenceController.java | 37 +++++++++++ .../EnterprisePrivacyFeatureProvider.java | 5 ++ .../EnterprisePrivacyFeatureProviderImpl.java | 5 ++ .../enterprise/EnterprisePrivacySettings.java | 1 + .../BackupsEnabledPreferenceControllerTest.java | 71 ++++++++++++++++++++++ .../EnterprisePrivacyFeatureProviderImplTest.java | 9 +++ .../enterprise/EnterprisePrivacySettingsTest.java | 4 +- 8 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/enterprise/BackupsEnabledPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml index 4fa50e7aae..0aa1415bc3 100644 --- a/res/xml/enterprise_privacy_settings.xml +++ b/res/xml/enterprise_privacy_settings.xml @@ -83,6 +83,9 @@ + controllers) { assertThat(controllers).isNotNull(); - assertThat(controllers.size()).isEqualTo(17); + assertThat(controllers.size()).isEqualTo(18); int position = 0; assertThat(controllers.get(position++)).isInstanceOf(NetworkLogsPreferenceController.class); assertThat(controllers.get(position++)).isInstanceOf(BugReportsPreferenceController.class); @@ -126,6 +126,8 @@ public class EnterprisePrivacySettingsTest { assertThat(controllers.get(position++)).isInstanceOf( CaCertsManagedProfilePreferenceController.class); assertThat(controllers.get(position++)).isInstanceOf( + BackupsEnabledPreferenceController.class); + assertThat(controllers.get(position++)).isInstanceOf( PreferenceCategoryController.class); assertThat(controllers.get(position++)).isInstanceOf( FailedPasswordWipeCurrentUserPreferenceController.class); -- 2.11.0