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

Do not tint app-icon of admin

Browse Source 
Only if no app-icon is used a tint should be applied to the ic_info
icon.

Change-Id: I92332110f99d14e86dc01700fa00b189c1d7d8ad
Fixes: 118879012
Test: Looked at dialog with default icon and with app-icon
This commit is contained in:
Philip P. Moltmann
2018-11-08 10:23:41 -08:00
parent 793a6eac3b
commit 6bd48be1dd
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/admin_support_details_dialog.xml
View File

@@ -27,8 +27,6 @@
<ImageView android:id="@+id/admin_support_icon" <ImageView android:id="@+id/admin_support_icon"
android:layout_width="@dimen/admin_details_dialog_icon_size" android:layout_width="@dimen/admin_details_dialog_icon_size"
android:layout_height="@dimen/admin_details_dialog_icon_size" android:layout_height="@dimen/admin_details_dialog_icon_size"
android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:contentDescription="@null" /> android:contentDescription="@null" />
<TextView android:id="@+id/admin_support_dialog_title" <TextView android:id="@+id/admin_support_dialog_title"

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

@@ -23,6 +23,8 @@ 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.res.ColorStateList;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Process; import android.os.Process;
import android.os.UserHandle; import android.os.UserHandle;
@@ -109,16 +111,24 @@ public class ActionDisabledByAdminDialogHelper {
if (admin == null) { if (admin == null) {
return; return;
} }
ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);
if (!RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin) if (!RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin)
|| !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId)) { || !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId)) {
admin = null; admin = null;
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 { } else {
final Drawable badgedIcon = Utils.getBadgedIcon( final Drawable badgedIcon = Utils.getBadgedIcon(
IconDrawableFactory.newInstance(mActivity), IconDrawableFactory.newInstance(mActivity),
mActivity.getPackageManager(), mActivity.getPackageManager(),
admin.getPackageName(), admin.getPackageName(),
userId); userId);
((ImageView) root.findViewById(R.id.admin_support_icon)).setImageDrawable(badgedIcon); supportIconView.setImageDrawable(badgedIcon);
} }
setAdminSupportTitle(root, restriction); setAdminSupportTitle(root, restriction);