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

Commit acc4fac2 authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Android (Google) Code Review
Browse files

Merge "Fix text color in multiuser menu when option is disabled" into main

parents 399c35b0 0c49c51d

packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,8 @@ import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FEATURES_NO 
import static android.app.admin.DevicePolicyManager.MTE_NOT_CONTROLLED_BY_POLICY;

import static android.app.admin.DevicePolicyManager.MTE_NOT_CONTROLLED_BY_POLICY;

import static android.app.admin.DevicePolicyManager.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER;

import static android.app.admin.DevicePolicyManager.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER;





import static com.android.settingslib.Utils.getColorAttrDefaultColor;



import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.annotation.UserIdInt;
@@ -639,7 +641,8 @@ public class RestrictedLockUtilsInternal extends RestrictedLockUtils { 
        removeExistingRestrictedSpans(sb);

        removeExistingRestrictedSpans(sb);





        if (admin != null) {

        if (admin != null) {

            final int disabledColor = context.getColor(R.color.disabled_text_color);

            final int disabledColor = getColorAttrDefaultColor(context,

                    android.R.attr.textColorHint);

            sb.setSpan(new ForegroundColorSpan(disabledColor), 0, sb.length(),

            sb.setSpan(new ForegroundColorSpan(disabledColor), 0, sb.length(),

                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

            ImageSpan image = new RestrictedLockImageSpan(context);

            ImageSpan image = new RestrictedLockImageSpan(context);