Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f42a857 authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "catalyst" into main

* changes:
  [Catalyst] Add restriction for SIMs and Tethering
  [Catalyst] Add restriction for Internet
parents d690869f d824a682
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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
+8 −1
Original line number Diff line number Diff line
@@ -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.ProvidePreferenceScreen
@@ -23,7 +25,7 @@ import com.android.settingslib.metadata.preferenceHierarchy
import com.android.settingslib.preference.PreferenceScreenCreator

@ProvidePreferenceScreen
class MobileNetworkListScreen : PreferenceScreenCreator {
class MobileNetworkListScreen : PreferenceScreenCreator, PreferenceRestrictionMixin {
    override val key: String
        get() = KEY

@@ -36,6 +38,11 @@ class MobileNetworkListScreen : PreferenceScreenCreator {
    override val keywords: Int
        get() = R.string.keywords_more_mobile_networks

    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)

    override val restrictionKey: String
        get() = UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS

    override fun isFlagEnabled(context: Context) = Flags.catalystMobileNetworkList()

    override fun hasCompleteHierarchy() = false
+9 −1
Original line number Diff line number Diff line
@@ -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
+9 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ package com.android.settings.network.tether

import android.content.Context
import android.net.TetheringManager
import android.os.UserManager
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R
import com.android.settings.flags.Flags
import com.android.settings.network.TetherPreferenceController
@@ -28,7 +30,8 @@ import com.android.settingslib.metadata.preferenceHierarchy
import com.android.settingslib.preference.PreferenceScreenCreator

@ProvidePreferenceScreen
class TetherScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
class TetherScreen :
    PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceRestrictionMixin {

    override val key: String
        get() = KEY
@@ -49,6 +52,11 @@ class TetherScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {

    override fun isAvailable(context: Context) = TetherUtil.isTetherAvailable(context)

    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)

    override val restrictionKey: String
        get() = UserManager.DISALLOW_CONFIG_TETHERING

    override fun isFlagEnabled(context: Context) = Flags.catalystTetherSettings()

    override fun hasCompleteHierarchy() = false