From 67c9e8f5367b8017048257e1948a3414ccdb1d3f Mon Sep 17 00:00:00 2001 From: Bartosz Fabianowski Date: Fri, 20 Jan 2017 19:27:33 +0100 Subject: [PATCH] Tell user that device owner can lock/wipe the device This CL adds information about the device owner's ability to lock and/or wipe the device remotely to the Enterprise Privacy Settings page. Bug: 32692748 Test: CTS Verifier Change-Id: I17a40c990ce2ac09b43e99774b8aefe297ea33b7 --- res/values/strings.xml | 4 ++++ res/xml/enterprise_privacy_settings.xml | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index df0186eafb8..52760c65cfe 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8083,6 +8083,10 @@ Always-on VPN turned on in your work profile Global HTTP proxy set + + Admin can lock device and reset password + + Admin can delete all device data This device is managed. diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml index 5fcb5b29ba2..cc63d5fcdd2 100644 --- a/res/xml/enterprise_privacy_settings.xml +++ b/res/xml/enterprise_privacy_settings.xml @@ -96,5 +96,15 @@ + +