Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new method "checkRestrictionEnforced" to RestrictedPreferenceHelper." into sc-dev

Browse Source
This commit is contained in:
Stanley Wang
2021-06-02 08:05:57 +00:00
committed by Android (Google) Code Review
parent b0e554dc8f eec7a6ca45
commit cb3e9c2bc8
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml
View File

@@ -48,7 +48,6 @@
android:layout_width="@dimen/settingslib_restricted_icon_size" android:layout_width="@dimen/settingslib_restricted_icon_size"
android:layout_height="@dimen/settingslib_restricted_icon_size" android:layout_height="@dimen/settingslib_restricted_icon_size"
android:tint="?android:attr/colorAccent" android:tint="?android:attr/colorAccent"
android:theme="@android:style/Theme.Material"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/settingslib_restricted_icon_margin_end" android:layout_marginEnd="@dimen/settingslib_restricted_icon_margin_end"
android:src="@*android:drawable/ic_info" android:src="@*android:drawable/ic_info"

11
packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
View File

@@ -138,6 +138,17 @@ public class RestrictedPreferenceHelper {
setDisabledByAdmin(admin); 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. * Disable this preference based on the enforce admin.
* *