PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Restrict SimPreference" into main

Browse Source
This commit is contained in:
Chaohui Wang
2024-03-11 09:27:49 +00:00
committed by Android (Google) Code Review
parent 15b42fe25a af43d95332
commit fd666490ec
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/spa/network/SimsSection.kt
View File

@@ -36,10 +36,10 @@ import com.android.settings.network.telephony.isSubscriptionEnabledFlow
import com.android.settings.network.telephony.phoneNumberFlow import com.android.settings.network.telephony.phoneNumberFlow
import com.android.settingslib.spa.widget.preference.PreferenceModel import com.android.settingslib.spa.widget.preference.PreferenceModel
import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
import com.android.settingslib.spa.widget.preference.TwoTargetSwitchPreference
import com.android.settingslib.spa.widget.ui.SettingsIcon import com.android.settingslib.spa.widget.ui.SettingsIcon
import com.android.settingslib.spaprivileged.model.enterprise.Restrictions import com.android.settingslib.spaprivileged.model.enterprise.Restrictions
import com.android.settingslib.spaprivileged.template.preference.RestrictedPreference import com.android.settingslib.spaprivileged.template.preference.RestrictedPreference
import com.android.settingslib.spaprivileged.template.preference.RestrictedTwoTargetSwitchPreference
@Composable @Composable
fun SimsSection(subscriptionInfoList: List<SubscriptionInfo>) { fun SimsSection(subscriptionInfoList: List<SubscriptionInfo>) {
@@ -61,9 +61,8 @@ private fun SimPreference(subInfo: SubscriptionInfo) {
val phoneNumber = remember(subInfo) { val phoneNumber = remember(subInfo) {
context.phoneNumberFlow(subInfo) context.phoneNumberFlow(subInfo)
}.collectAsStateWithLifecycle(initialValue = null) }.collectAsStateWithLifecycle(initialValue = null)
//TODO: Add the Restricted TwoTargetSwitchPreference in SPA RestrictedTwoTargetSwitchPreference(
TwoTargetSwitchPreference( model = object : SwitchPreferenceModel {
object : SwitchPreferenceModel {
override val title = subInfo.displayName.toString() override val title = subInfo.displayName.toString()
override val summary = { phoneNumber.value ?: "" } override val summary = { phoneNumber.value ?: "" }
override val checked = { checked.value } override val checked = { checked.value }
@@ -74,7 +73,8 @@ private fun SimPreference(subInfo: SubscriptionInfo) {
newChecked, newChecked,
) )
} }
} },
restrictions = Restrictions(keys = listOf(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)),
) { ) {
MobileNetworkUtils.launchMobileNetworkSettings(context, subInfo) MobileNetworkUtils.launchMobileNetworkSettings(context, subInfo)
} }