PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Policy transparency dialog layout" into sc-dev am: 88346ce71c am: 3127f05be9 am: c3cc642534

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733192

Change-Id: Ida67a4838be73176d792e9edae1f10610c29a1aa
This commit is contained in:
TreeHugger Robot
2021-05-31 03:06:52 +00:00
committed by Automerger Merge Worker
parent ae12fa6ae5 c3cc642534
commit 132acb43aa
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -3191,7 +3191,7 @@
</activity> </activity>
<activity android:name=".enterprise.ActionDisabledByAdminDialog" <activity android:name=".enterprise.ActionDisabledByAdminDialog"
android:theme="@style/Transparent" android:theme="@style/Theme.AlertDialog"
android:taskAffinity="com.android.settings.enterprise" android:taskAffinity="com.android.settings.enterprise"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="true" android:exported="true"

5
src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
View File

@@ -37,6 +37,7 @@ import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.Utils;
import com.android.settingslib.enterprise.ActionDisabledByAdminController; import com.android.settingslib.enterprise.ActionDisabledByAdminController;
import com.android.settingslib.enterprise.ActionDisabledByAdminControllerFactory; import com.android.settingslib.enterprise.ActionDisabledByAdminControllerFactory;
@@ -139,7 +140,9 @@ public class ActionDisabledByAdminDialogHelper {
void setAdminSupportIcon(View root, ComponentName admin, int userId) { void setAdminSupportIcon(View root, ComponentName admin, int userId) {
ImageView supportIconView = root.requireViewById(R.id.admin_support_icon); ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);
supportIconView.setImageDrawable( 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 @VisibleForTesting