Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b83f909 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not tint app-icon of admin"

parents fd2a781b 6bd48be1

res/layout/admin_support_details_dialog.xml

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
        <ImageView android:id="@+id/admin_support_icon"

                android:layout_width="@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:contentDescription="@null" />

        <TextView android:id="@+id/admin_support_dialog_title"

src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java

+11 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import android.app.admin.DevicePolicyManager; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.res.ColorStateList;

import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.os.Process;

import android.os.UserHandle;
@@ -109,16 +111,24 @@ public class ActionDisabledByAdminDialogHelper { 
        if (admin == null) {

            return;

        }

        ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);

        if (!RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin)

                || !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId)) {

            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 {

            final Drawable badgedIcon = Utils.getBadgedIcon(

                    IconDrawableFactory.newInstance(mActivity),

                    mActivity.getPackageManager(),

                    admin.getPackageName(),

                    userId);

            ((ImageView) root.findViewById(R.id.admin_support_icon)).setImageDrawable(badgedIcon);

            supportIconView.setImageDrawable(badgedIcon);

        }



        setAdminSupportTitle(root, restriction);