Implement RestrictedPreferenceHelperProvider for RestrictedSliderPreference (d700176d) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/RestrictedInterface.kt

deleted100644 → 0

+0 −49

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settingslib

		import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin

		interface RestrictedInterface {
		fun useAdminDisabledSummary(useSummary: Boolean)

		fun checkRestrictionAndSetDisabled(userRestriction: String)

		fun checkRestrictionAndSetDisabled(userRestriction: String, userId: Int)

		/**
		* Checks if the given setting is subject to Enhanced Confirmation Mode restrictions for this
		* package. Marks the preference as disabled if so.
		*
		* @param settingIdentifier The key identifying the setting
		* @param packageName the package to check the settingIdentifier for
		*/
		fun checkEcmRestrictionAndSetDisabled(
		settingIdentifier: String,
		packageName: String
		)

		val isDisabledByAdmin: Boolean

		fun setDisabledByAdmin(admin: EnforcedAdmin?)

		val isDisabledByEcm: Boolean

		val uid: Int

		val packageName: String?
		}

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

+11 −54

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.settingslib;
		import android.annotation.SuppressLint;
		import android.content.Context;
		import android.os.Process;
		import android.os.UserHandle;
		import android.util.AttributeSet;

		import androidx.annotation.NonNull;
		@@ -34,8 +33,10 @@ import com.android.settingslib.widget.SliderPreference;
		* Slide Preference that supports being disabled by a user restriction
		* set by a device admin.
		*/
		public class RestrictedSliderPreference extends SliderPreference implements RestrictedInterface {
		RestrictedPreferenceHelper mHelper;
		public class RestrictedSliderPreference extends SliderPreference implements
		RestrictedPreferenceHelperProvider {

		private final RestrictedPreferenceHelper mHelper;

		public RestrictedSliderPreference(@NonNull Context context, @Nullable AttributeSet attrs,
		int defStyleAttr, @Nullable String packageName, int uid) {
		@@ -65,6 +66,11 @@ public class RestrictedSliderPreference extends SliderPreference implements Rest
		android.R.attr.preferenceStyle), packageName, uid);
		}

		@Override
		public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() {
		return mHelper;
		}

		@Override
		public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {
		super.onBindViewHolder(holder);
		@@ -81,12 +87,12 @@ public class RestrictedSliderPreference extends SliderPreference implements Rest

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

		if (enabled && isDisabledByEcm()) {
		if (enabled && mHelper.isDisabledByEcm()) {
		mHelper.setDisabledByEcm(null);
		return;
		}
		@@ -94,55 +100,6 @@ public class RestrictedSliderPreference extends SliderPreference implements Rest
		super.setEnabled(enabled);
		}

		@Override
		public void useAdminDisabledSummary(boolean useSummary) {
		mHelper.useAdminDisabledSummary(useSummary);
		}

		@Override
		public void checkRestrictionAndSetDisabled(@NonNull String userRestriction) {
		mHelper.checkRestrictionAndSetDisabled(userRestriction, UserHandle.myUserId());
		}

		@Override
		public void checkRestrictionAndSetDisabled(@NonNull String userRestriction, int userId) {
		mHelper.checkRestrictionAndSetDisabled(userRestriction, userId);
		}

		@Override
		public void checkEcmRestrictionAndSetDisabled(@NonNull String settingIdentifier,
		@NonNull String packageName) {
		mHelper.checkEcmRestrictionAndSetDisabled(settingIdentifier, packageName);
		}

		@Override
		public void setDisabledByAdmin(@Nullable RestrictedLockUtils.EnforcedAdmin admin) {
		if (mHelper.setDisabledByAdmin(admin)) {
		notifyChanged();
		}
		}

		@Override
		public boolean isDisabledByAdmin() {
		return mHelper.isDisabledByAdmin();
		}

		@Override
		public boolean isDisabledByEcm() {
		return mHelper.isDisabledByEcm();
		}

		@Override
		public int getUid() {
		return mHelper != null ? mHelper.uid : Process.INVALID_UID;
		}

		@Override
		@Nullable
		public String getPackageName() {
		return mHelper != null ? mHelper.packageName : null;
		}

		@Override
		protected void onAttachedToHierarchy(@NonNull PreferenceManager preferenceManager) {
		mHelper.onAttachedToHierarchy();