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

Commit 8a33bd59 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "RestrictedLockUtils was split into ...Internal"

parents 847865dc e3f72113

src/com/android/settings/MasterClear.java

+5 −3
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; 
import com.android.settings.password.ChooseLockSettingsHelper;

import com.android.settings.password.ConfirmLockPattern;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtilsInternal;



import java.util.List;
@@ -499,11 +500,12 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL 
    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        final Context context = getContext();

        final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(context,

        final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,

                UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());

        final UserManager um = UserManager.get(context);

        final boolean disallow = !um.isAdminUser() || RestrictedLockUtils.hasBaseUserRestriction(

                context, UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());

        final boolean disallow = !um.isAdminUser() || RestrictedLockUtilsInternal

                .hasBaseUserRestriction(context, UserManager.DISALLOW_FACTORY_RESET,

                        UserHandle.myUserId());

        if (disallow && !Utils.isDemoUser(context)) {

            return inflater.inflate(R.layout.master_clear_disallowed_screen, null);

        } else if (admin != null) {

src/com/android/settings/MasterClearConfirm.java

+3 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.settings.core.InstrumentedFragment;

import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtilsInternal;



/**

 * Confirm and execute a reset of the device to a clean "just out of the box"
@@ -146,9 +147,9 @@ public class MasterClearConfirm extends InstrumentedFragment { 
    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(

        final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(

                getActivity(), UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());

        if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(),

        if (RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),

                UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {

            return inflater.inflate(R.layout.master_clear_disallowed_screen, null);

        } else if (admin != null) {

src/com/android/settings/ResetNetwork.java

+3 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.settings.password.ChooseLockSettingsHelper; 
import com.android.settings.password.ConfirmLockPattern;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

import com.android.settingslib.RestrictedLockUtilsInternal;



import java.util.ArrayList;

import java.util.List;
@@ -240,9 +241,9 @@ public class ResetNetwork extends InstrumentedFragment { 
    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        final UserManager um = UserManager.get(getActivity());

        final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(

        final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(

                getActivity(), UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());

        if (!um.isAdminUser() || RestrictedLockUtils.hasBaseUserRestriction(getActivity(),

        if (!um.isAdminUser() || RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),

                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {

            return inflater.inflate(R.layout.network_reset_disallowed_screen, null);

        } else if (admin != null) {

src/com/android/settings/ResetNetworkConfirm.java

+3 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.settings.core.InstrumentedFragment; 
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;

import com.android.settings.network.ApnSettings;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtilsInternal;



/**

 * Confirm and execute a reset of the network settings to a clean "just out of the box"
@@ -204,9 +205,9 @@ public class ResetNetworkConfirm extends InstrumentedFragment { 
    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(

        final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(

                getActivity(), UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());

        if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(),

        if (RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),

                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {

            return inflater.inflate(R.layout.network_reset_disallowed_screen, null);

        } else if (admin != null) {

src/com/android/settings/RestrictedCheckBox.java

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.util.AttributeSet; 
import android.widget.CheckBox;



import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtilsInternal;



/**

 * A checkbox that can be restricted by device policy, in which case it shows a dialog explaining
@@ -57,7 +58,8 @@ public class RestrictedCheckBox extends CheckBox { 
        mEnforcedAdmin = admin;

        if (mDisabledByAdmin != disabled) {

            mDisabledByAdmin = disabled;

            RestrictedLockUtils.setTextViewAsDisabledByAdmin(mContext, this, mDisabledByAdmin);

            RestrictedLockUtilsInternal.setTextViewAsDisabledByAdmin(mContext, this,

                    mDisabledByAdmin);

            if (mDisabledByAdmin) {

                getButtonDrawable().setColorFilter(mContext.getColor(R.color.disabled_text_color),

                        PorterDuff.Mode.MULTIPLY);