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

Merge "Badge the icon properly in policy transparency dialog" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-11 18:16:29 +00:00
committed by Android (Google) Code Review
parent f142ace1d0 42b83a604f
commit df68a76e33
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,19 +18,16 @@ package com.android.settings.enterprise;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AppGlobals;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Process; import android.os.Process;
import android.os.RemoteException;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.support.annotation.VisibleForTesting; import android.support.annotation.VisibleForTesting;
import android.util.Log; import android.util.IconDrawableFactory;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -40,6 +37,7 @@ import android.widget.TextView;
import com.android.settings.DeviceAdminAdd; import com.android.settings.DeviceAdminAdd;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Settings; import com.android.settings.Settings;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -99,20 +97,12 @@ public class ActionDisabledByAdminDialogHelper {
|| !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId)) { || !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId)) {
admin = null; admin = null;
} else { } else {
ActivityInfo ai = null; final Drawable badgedIcon = Utils.getBadgedIcon(
try { IconDrawableFactory.newInstance(mActivity),
ai = AppGlobals.getPackageManager().getReceiverInfo(admin, 0 /* flags */, mActivity.getPackageManager(),
userId); admin.getPackageName(),
} catch (RemoteException e) { userId);
Log.w(TAG, "Missing reciever info", e); ((ImageView) root.findViewById(R.id.admin_support_icon)).setImageDrawable(badgedIcon);
}
if (ai != null) {
final Drawable icon = ai.loadIcon(mActivity.getPackageManager());
final Drawable badgedIcon = mActivity.getPackageManager().getUserBadgedIcon(
icon, new UserHandle(userId));
((ImageView) root.findViewById(R.id.admin_support_icon)).setImageDrawable(
badgedIcon);
}
} }
setAdminSupportTitle(root, restriction); setAdminSupportTitle(root, restriction);