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

Commit f3d1e4e4 authored by Stanley Wang's avatar Stanley Wang Committed by Automerger Merge Worker
Browse files

Merge "Add new method "checkRestrictionEnforced" to... 

Merge "Add new method "checkRestrictionEnforced" to RestrictedPreferenceHelper." into sc-dev am: cb3e9c2b am: 30c467c6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14758921

Change-Id: I71f29ee5eba51b5ec9271ea2754a06b5c70718e3
parents b9892abf 30c467c6

packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
            android:layout_width="@dimen/settingslib_restricted_icon_size"

            android:layout_height="@dimen/settingslib_restricted_icon_size"

            android:tint="?android:attr/colorAccent"

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

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="@dimen/settingslib_restricted_icon_margin_end"

            android:src="@*android:drawable/ic_info"

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

+11 −0
Original line number Diff line number Diff line
@@ -138,6 +138,17 @@ public class RestrictedPreferenceHelper { 
        setDisabledByAdmin(admin);

    }



    /**

     * @return EnforcedAdmin if we have been passed the restriction in the xml.

     */

    public EnforcedAdmin checkRestrictionEnforced() {

        if (mAttrUserRestriction == null) {

            return null;

        }

        return RestrictedLockUtilsInternal.checkIfRestrictionEnforced(mContext,

                mAttrUserRestriction, UserHandle.myUserId());

    }



    /**

     * Disable this preference based on the enforce admin.

     *