[Catalyst] Add restriction for Internet
Also add the missing settings:userRestriction in xml. Bug: 377600992 Flag: com.android.settings.flags.catalyst Test: testdpc Change-Id: I179dbba19867d864ec2df5989857083511777514
This commit is contained in:
@@ -30,6 +30,7 @@
|
||||
settings:allowDividerAbove="true"
|
||||
settings:keywords="@string/keywords_internet"
|
||||
settings:useAdminDisabledSummary="true"
|
||||
settings:userRestriction="no_config_wifi"
|
||||
settings:controller="com.android.settings.network.InternetPreferenceControllerV2" />
|
||||
|
||||
<com.android.settingslib.RestrictedPreference
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
package com.android.settings.network
|
||||
|
||||
import android.content.Context
|
||||
import android.os.UserManager
|
||||
import com.android.settings.PreferenceRestrictionMixin
|
||||
import com.android.settings.R
|
||||
import com.android.settings.flags.Flags
|
||||
import com.android.settingslib.metadata.PreferenceAvailabilityProvider
|
||||
@@ -24,7 +26,8 @@ import com.android.settingslib.metadata.preferenceHierarchy
|
||||
import com.android.settingslib.preference.PreferenceScreenCreator
|
||||
|
||||
@ProvidePreferenceScreen
|
||||
class NetworkProviderScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
|
||||
class NetworkProviderScreen :
|
||||
PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceRestrictionMixin {
|
||||
override val key: String
|
||||
get() = KEY
|
||||
|
||||
@@ -40,6 +43,11 @@ class NetworkProviderScreen : PreferenceScreenCreator, PreferenceAvailabilityPro
|
||||
override fun isAvailable(context: Context) =
|
||||
context.resources.getBoolean(R.bool.config_show_internet_settings)
|
||||
|
||||
override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
|
||||
|
||||
override val restrictionKey: String
|
||||
get() = UserManager.DISALLOW_CONFIG_WIFI
|
||||
|
||||
override fun isFlagEnabled(context: Context) = Flags.catalystInternetSettings()
|
||||
|
||||
override fun hasCompleteHierarchy() = false
|
||||
|
||||
Reference in New Issue
Block a user