Merge "[Catalyst] Support multiple restriction keys" into main

src/com/android/settings/PreferenceRestrictionMixin.kt

@@ -18,27 +18,42 @@ package com.android.settings
 
 import android.content.Context
 import android.os.UserHandle
+import android.os.UserManager
 import androidx.annotation.CallSuper
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin
 import com.android.settingslib.RestrictedLockUtilsInternal
 import com.android.settingslib.metadata.PreferenceRestrictionProvider
 
 /** Mixin to support restriction. */
 interface PreferenceRestrictionMixin : PreferenceRestrictionProvider {
 
-    val restrictionKey: String
+    /**
+     * Keys for restriction.
+     *
+     * Preference is restricted when **ANY** key in the list is restricted.
+     */
+    val restrictionKeys: Array<String>
 
     val useAdminDisabledSummary: Boolean
         get() = false
 
-    @CallSuper fun isEnabled(context: Context) = !context.hasBaseUserRestriction(restrictionKey)
+    @CallSuper fun isEnabled(context: Context) = !context.hasBaseUserRestriction(restrictionKeys)
 
     override fun isRestricted(context: Context) =
-        RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+        context.getRestrictionEnforcedAdmin(restrictionKeys) != null
-            context,
-            restrictionKey,
-            UserHandle.myUserId(),
-        ) != null
 }
 
-fun Context.hasBaseUserRestriction(restrictionKey: String) =
+/** Returns the admin that has enforced restriction on given keys. */
-    RestrictedLockUtilsInternal.hasBaseUserRestriction(this, restrictionKey, UserHandle.myUserId())
+fun Context.getRestrictionEnforcedAdmin(restrictionKeys: Array<String>): EnforcedAdmin? {
+    val userId = UserHandle.myUserId()
+    return restrictionKeys.firstNotNullOfOrNull {
+        RestrictedLockUtilsInternal.checkIfRestrictionEnforced(this, it, userId)
+    }
+}
+
+/** Returns if there is **any** base user restriction on given keys. */
+fun Context.hasBaseUserRestriction(restrictionKeys: Array<String>): Boolean {
+    val userManager = getSystemService(UserManager::class.java) ?: return false
+    val userHandle = UserHandle.of(UserHandle.myUserId())
+    return restrictionKeys.any { userManager.hasBaseUserRestriction(it, userHandle) }
+}

src/com/android/settings/SettingsPreferenceBindingFactory.kt

@@ -16,7 +16,6 @@
 
 package com.android.settings
 
-import android.os.UserHandle
 import androidx.preference.Preference
 import com.android.settingslib.RestrictedPreferenceHelperProvider
 import com.android.settingslib.metadata.PreferenceHierarchyNode
@@ -37,10 +36,11 @@ class SettingsPreferenceBindingFactory : DefaultPreferenceBindingFactory() {
         if (metadata is PreferenceRestrictionMixin) {
             if (preference is RestrictedPreferenceHelperProvider) {
                 preference.getRestrictedPreferenceHelper().apply {
-                    val restrictionKey = metadata.restrictionKey
+                    useAdminDisabledSummary(metadata.useAdminDisabledSummary)
-                    if (!preference.context.hasBaseUserRestriction(restrictionKey)) {
+                    val context = preference.context
-                        useAdminDisabledSummary(metadata.useAdminDisabledSummary)
+                    val restrictionKeys = metadata.restrictionKeys
-                        checkRestrictionAndSetDisabled(restrictionKey, UserHandle.myUserId())
+                    if (!context.hasBaseUserRestriction(restrictionKeys)) {
+                        setDisabledByAdmin(context.getRestrictionEnforcedAdmin(restrictionKeys))
                     }
                 }
             }

src/com/android/settings/display/AutoBrightnessScreen.kt

@@ -74,8 +74,8 @@ class AutoBrightnessScreen :
 
     override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
 
-    override val restrictionKey: String
+    override val restrictionKeys
-        get() = UserManager.DISALLOW_CONFIG_BRIGHTNESS
+        get() = arrayOf(UserManager.DISALLOW_CONFIG_BRIGHTNESS)
 
     override val useAdminDisabledSummary: Boolean
         get() = true

src/com/android/settings/display/BrightnessLevelPreference.kt

@@ -71,8 +71,8 @@ class BrightnessLevelPreference :
 
     override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
 
-    override val restrictionKey: String
+    override val restrictionKeys
-        get() = UserManager.DISALLOW_CONFIG_BRIGHTNESS
+        get() = arrayOf(UserManager.DISALLOW_CONFIG_BRIGHTNESS)
 
     override val useAdminDisabledSummary: Boolean
         get() = true

src/com/android/settings/network/MobileNetworkListScreen.kt

@@ -40,8 +40,8 @@ class MobileNetworkListScreen : PreferenceScreenCreator, PreferenceRestrictionMi
 
     override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
 
-    override val restrictionKey: String
+    override val restrictionKeys
-        get() = UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS
+        get() = arrayOf(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)
 
     override fun isFlagEnabled(context: Context) = Flags.catalystMobileNetworkList()
 

src/com/android/settings/network/NetworkProviderScreen.kt

@@ -45,8 +45,8 @@ class NetworkProviderScreen :
 
     override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
 
-    override val restrictionKey: String
+    override val restrictionKeys
-        get() = UserManager.DISALLOW_CONFIG_WIFI
+        get() = arrayOf(UserManager.DISALLOW_CONFIG_WIFI)
 
     override fun isFlagEnabled(context: Context) = Flags.catalystInternetSettings()
 

src/com/android/settings/network/tether/TetherScreen.kt

@@ -54,8 +54,8 @@ class TetherScreen :
 
     override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
 
-    override val restrictionKey: String
+    override val restrictionKeys
-        get() = UserManager.DISALLOW_CONFIG_TETHERING
+        get() = arrayOf(UserManager.DISALLOW_CONFIG_TETHERING)
 
     override fun isFlagEnabled(context: Context) = Flags.catalystTetherSettings()
 

src/com/android/settings/notification/CallVolumePreference.kt

@@ -57,8 +57,8 @@ open class CallVolumePreference :
 
     override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
 
-    override val restrictionKey: String
+    override val restrictionKeys
-        get() = UserManager.DISALLOW_ADJUST_VOLUME
+        get() = arrayOf(UserManager.DISALLOW_ADJUST_VOLUME)
 
     override fun storage(context: Context): KeyValueStore {
         val helper = createAudioHelper(context)

src/com/android/settings/notification/MediaVolumePreference.kt

@@ -58,8 +58,8 @@ open class MediaVolumePreference :
 
     override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
 
-    override val restrictionKey: String
+    override val restrictionKeys
-        get() = UserManager.DISALLOW_ADJUST_VOLUME
+        get() = arrayOf(UserManager.DISALLOW_ADJUST_VOLUME)
 
     override fun storage(context: Context): KeyValueStore {
         val helper = createAudioHelper(context)

src/com/android/settings/notification/SeparateRingVolumePreference.kt

@@ -67,8 +67,8 @@ open class SeparateRingVolumePreference :
 
     override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
 
-    override val restrictionKey: String
+    override val restrictionKeys
-        get() = UserManager.DISALLOW_ADJUST_VOLUME
+        get() = arrayOf(UserManager.DISALLOW_ADJUST_VOLUME)
 
     override fun storage(context: Context): KeyValueStore {
         val helper = createAudioHelper(context)

src/com/android/settings/restriction/UserRestrictionBindingHelper.kt

@@ -34,7 +34,9 @@ class UserRestrictionBindingHelper(
                 screenBindingHelper.forEachRecursively {
                     val metadata = it.metadata
                     if (metadata is PreferenceRestrictionMixin) {
-                        getOrPut(metadata.restrictionKey) { mutableSetOf() }.add(metadata.key)
+                        for (restrictionKey in metadata.restrictionKeys) {
+                            getOrPut(restrictionKey) { mutableSetOf() }.add(metadata.key)
+                        }
                     }
                 }
             }