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

Merge "Update Policy transparency dialog to new style" into sc-dev am: 9081a2e67d

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

Change-Id: Ib26fc131216d2c423c176be6a0ec2a3e7de20f27
This commit is contained in:
TreeHugger Robot
2021-05-24 03:40:15 +00:00
committed by Automerger Merge Worker
parent eb89ceba91 9081a2e67d
commit 14c2dfadb0
4 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,12 +22,8 @@ import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Process;
import android.os.UserHandle;
import android.util.IconDrawableFactory;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -38,7 +34,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -143,21 +138,8 @@ public class ActionDisabledByAdminDialogHelper {
@VisibleForTesting
void setAdminSupportIcon(View root, ComponentName admin, int userId) {
ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);
if (isNotCurrentUserOrProfile(admin, userId)) {
supportIconView.setImageDrawable(
mActivity.getDrawable(com.android.internal.R.drawable.ic_info));
TypedArray ta = mActivity.obtainStyledAttributes(new int[]{android.R.attr.colorAccent});
supportIconView.setImageTintList(ColorStateList.valueOf(ta.getColor(0, 0)));
ta.recycle();
} else {
final Drawable badgedIcon = Utils.getBadgedIcon(
IconDrawableFactory.newInstance(mActivity),
mActivity.getPackageManager(),
admin.getPackageName(),
userId);
supportIconView.setImageDrawable(badgedIcon);
}
supportIconView.setImageDrawable(
mActivity.getDrawable(com.android.internal.R.drawable.ic_corp_badge));
}
@VisibleForTesting