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

Commit eec7a6ca authored by Stanley Wang's avatar Stanley Wang
Browse files

Add new method "checkRestrictionEnforced" to 

RestrictedPreferenceHelper.

- Return the EnforcedAdmin object if the preference is retricted.

Bug: 179245126
Test: robotest and see the UI
Change-Id: I0687bb5e1bafa6c50f7c4e1400e6d4ed7c03c9b1
parent ad970d64

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.

     *