From 47354889020f831854ad0c847ac767fe2455330d Mon Sep 17 00:00:00 2001 From: Nicolas Prevot Date: Tue, 24 Jan 2017 14:29:59 +0000 Subject: [PATCH] Add policy transparency to Settings > device administrators In Settings > device administrators: if the user wants to remove a work profile but DISALLOW_REMOVE_MANAGED_PROFILE is set: show policy transparency. BUG:33925172 BUG:34455202 Test: manual Change-Id: Ifbb9806e92e759039d592af29568bffce5fbb92a --- res/layout/device_admin_add.xml | 27 ++++++++---- src/com/android/settings/DeviceAdminAdd.java | 45 ++++++++++++++++++-- 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml index 8b79eaf54b8..29d7b53bdb6 100644 --- a/res/layout/device_admin_add.xml +++ b/res/layout/device_admin_add.xml @@ -129,14 +129,25 @@ android:orientation="vertical" android:divider="?android:attr/dividerHorizontal" android:showDividers="beginning|middle|end"> -