Merge "Made changes to padlock support for preferences." (659133c7) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,15 @@ public class RestrictedPreference extends Preference {
		mHelper.checkRestrictionAndSetDisabled(userRestriction, userId);
		}

		@Override
		public void setEnabled(boolean enabled) {
		if (enabled && isDisabledByAdmin()) {
		mHelper.setDisabledByAdmin(null);
		return;
		}
		super.setEnabled(enabled);
		}

		public void setDisabledByAdmin(EnforcedAdmin admin) {
		if (mHelper.setDisabledByAdmin(admin)) {
		notifyChanged();

+15 −15

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ public class RestrictedPreferenceHelper {
		private EnforcedAdmin mEnforcedAdmin;
		private String mAttrUserRestriction = null;

		RestrictedPreferenceHelper(Context context, Preference preference,
		public RestrictedPreferenceHelper(Context context, Preference preference,
		AttributeSet attrs) {
		mContext = context;
		mPreference = preference;
		@@ -54,8 +54,7 @@ public class RestrictedPreferenceHelper {
		mRestrictedPadlockPadding = mContext.getResources().getDimensionPixelSize(
		R.dimen.restricted_lock_icon_padding);

		mAttrUserRestriction = attrs.getAttributeValue(
		R.styleable.RestrictedPreference_userRestriction);
		if (attrs != null) {
		final TypedArray attributes = context.obtainStyledAttributes(attrs,
		R.styleable.RestrictedPreference);
		final TypedValue userRestriction =
		@@ -70,6 +69,7 @@ public class RestrictedPreferenceHelper {
		}
		mAttrUserRestriction = data == null ? null : data.toString();
		}
		}

		/**
		* Modify PreferenceViewHolder to add padlock if restriction is disabled.
		@@ -100,7 +100,7 @@ public class RestrictedPreferenceHelper {
		/**
		* Disable / enable if we have been passed the restriction in the xml.
		*/
		protected void onAttachedToHierarchy() {
		public void onAttachedToHierarchy() {
		if (mAttrUserRestriction != null) {
		checkRestrictionAndSetDisabled(mAttrUserRestriction, UserHandle.myUserId());
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,15 @@ public class RestrictedSwitchPreference extends SwitchPreference {
		mHelper.checkRestrictionAndSetDisabled(userRestriction, userId);
		}

		@Override
		public void setEnabled(boolean enabled) {
		if (enabled && isDisabledByAdmin()) {
		mHelper.setDisabledByAdmin(null);
		return;
		}
		super.setEnabled(enabled);
		}

		public void setDisabledByAdmin(EnforcedAdmin admin) {
		if (mHelper.setDisabledByAdmin(admin)) {
		notifyChanged();