From eec7a6ca451c3a8fda7195dffec130b4b8aeb271 Mon Sep 17 00:00:00 2001 From: Stanley Wang Date: Sat, 29 May 2021 19:01:53 +0800 Subject: [PATCH] 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 --- .../res/layout-v31/settingslib_main_switch_bar.xml | 1 - .../settingslib/RestrictedPreferenceHelper.java | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml b/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml index 010b9ba4324bc..2d214fe65c641 100644 --- a/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml +++ b/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml @@ -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" diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java index 2dbfef0391972..83a6973ffec69 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java @@ -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. *