From 83507b5f336475e470cb6003d9e6f2460f6b5cb9 Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Thu, 27 May 2021 00:47:03 +0800
Subject: [PATCH] Update Policy transparency dialog layout

- Update icon
- Fix color didn't apply dark theme.

Bug: 188756125
Bug: 189167991
Test: manual
Change-Id: Ie975c8999efe352fc9485d936a065d33e5ca76b1
---
 AndroidManifest.xml                                          | 2 +-
 .../enterprise/ActionDisabledByAdminDialogHelper.java        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f992e45c8e1..aa251f60ca4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3190,7 +3190,7 @@
         </activity>
 
         <activity android:name=".enterprise.ActionDisabledByAdminDialog"
-                android:theme="@style/Transparent"
+                  android:theme="@style/Theme.AlertDialog"
                 android:taskAffinity="com.android.settings.enterprise"
                 android:excludeFromRecents="true"
                 android:exported="true"
diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
index 2a5eda217a6..056afdb00ba 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
@@ -37,6 +37,7 @@ import com.android.settings.R;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.Utils;
 import com.android.settingslib.enterprise.ActionDisabledByAdminController;
 import com.android.settingslib.enterprise.ActionDisabledByAdminControllerFactory;
 
@@ -139,7 +140,9 @@ public class ActionDisabledByAdminDialogHelper {
     void setAdminSupportIcon(View root, ComponentName admin, int userId) {
         ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);
         supportIconView.setImageDrawable(
-                mActivity.getDrawable(com.android.internal.R.drawable.ic_corp_badge));
+                mActivity.getDrawable(R.drawable.ic_lock_closed));
+
+        supportIconView.setImageTintList(Utils.getColorAccent(mActivity));
     }
 
     @VisibleForTesting