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

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

Merge "Update Policy transparency dialog layout" into sc-dev

parents bc587c4d 83507b5f

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -3190,7 +3190,7 @@ 
        </activity>



        <activity android:name=".enterprise.ActionDisabledByAdminDialog"

                android:theme="@style/Transparent"

                  android:theme="@style/Theme.AlertDialog"

                android:taskAffinity="com.android.settings.enterprise"

                android:excludeFromRecents="true"

                android:exported="true"

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

+4 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.settings.R; 
import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

import com.android.settingslib.RestrictedLockUtilsInternal;

import com.android.settingslib.Utils;

import com.android.settingslib.enterprise.ActionDisabledByAdminController;

import com.android.settingslib.enterprise.ActionDisabledByAdminControllerFactory;
@@ -139,7 +140,9 @@ public class ActionDisabledByAdminDialogHelper { 
    void setAdminSupportIcon(View root, ComponentName admin, int userId) {

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

        supportIconView.setImageDrawable(

                mActivity.getDrawable(com.android.internal.R.drawable.ic_corp_badge));

                mActivity.getDrawable(R.drawable.ic_lock_closed));



        supportIconView.setImageTintList(Utils.getColorAccent(mActivity));

    }



    @VisibleForTesting