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

Merge "Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device" into sc-dev

Browse Source
This commit is contained in:
Rajeev Kumar
2021-03-16 16:50:02 +00:00
committed by Android (Google) Code Review
parent 23562377b0 0e0247e5e4
commit 815558188f
2 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,17 +141,14 @@ public class ActionDisabledByAdminDialogHelper {
}
private boolean isNotCurrentUserOrProfile(ComponentName admin, int userId) {
return !isFinancedDevice()
&& (!RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin)
|| !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId));
return !RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin)
|| !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId);
}
@VisibleForTesting
void setAdminSupportIcon(View root, ComponentName admin, int userId) {
ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);
if (isFinancedDevice()) {
supportIconView.setVisibility(View.GONE);
} else if (isNotCurrentUserOrProfile(admin, userId)) {
if (isNotCurrentUserOrProfile(admin, userId)) {
supportIconView.setImageDrawable(
mActivity.getDrawable(com.android.internal.R.drawable.ic_info));