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

Merge "Add condition for askEveryTime of SMS at Primary Sim" into main

Browse Source
This commit is contained in:
SongFerng Wang
2024-07-01 08:01:50 +00:00
committed by Android (Google) Code Review
parent 1d838f62ea 1892d20ce8
commit 183a191cbf
3 changed files with 223 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt
View File

@@ -279,14 +279,14 @@ fun PrimarySimImpl(
) {
CreatePrimarySimListPreference(
stringResource(id = R.string.primary_sim_calls_title),
primarySimInfo.callsAndSmsList,
primarySimInfo.callsList,
callsSelectedId,
ImageVector.vectorResource(R.drawable.ic_phone),
actionSetCalls
)
CreatePrimarySimListPreference(
stringResource(id = R.string.primary_sim_texts_title),
primarySimInfo.callsAndSmsList,
primarySimInfo.smsList,
textsSelectedId,
Icons.AutoMirrored.Outlined.Message,
actionSetTexts

20
src/com/android/settings/spa/network/PrimarySimRepository.kt
View File

@@ -22,12 +22,14 @@ import android.telephony.SubscriptionManager
import android.util.Log
import com.android.settings.R
import com.android.settings.network.SubscriptionUtil
import com.android.settings.network.telephony.CarrierConfigRepository
import com.android.settingslib.spa.widget.preference.ListPreferenceOption
class PrimarySimRepository(private val context: Context) {
data class PrimarySimInfo(
val callsAndSmsList: List<ListPreferenceOption>,
val callsList: List<ListPreferenceOption>,
val smsList: List<ListPreferenceOption>,
val dataList: List<ListPreferenceOption>,
)
@@ -37,7 +39,8 @@ class PrimarySimRepository(private val context: Context) {
return null
}
val callsAndSmsList = mutableListOf<ListPreferenceOption>()
val callsList = mutableListOf<ListPreferenceOption>()
val smsList = mutableListOf<ListPreferenceOption>()
val dataList = mutableListOf<ListPreferenceOption>()
for (info in selectableSubscriptionInfoList) {
val item = ListPreferenceOption(
@@ -45,15 +48,22 @@ class PrimarySimRepository(private val context: Context) {
text = "${info.displayName}",
summary = SubscriptionUtil.getBidiFormattedPhoneNumber(context, info) ?: "",
)
callsAndSmsList += item
callsList += item
smsList += item
dataList += item
}
callsAndSmsList += ListPreferenceOption(
val askEveryTime = ListPreferenceOption(
id = SubscriptionManager.INVALID_SUBSCRIPTION_ID,
text = context.getString(R.string.sim_calls_ask_first_prefs_title),
)
callsList += askEveryTime
if (context.resources
.getBoolean(com.android.internal.R.bool.config_sms_ask_every_time_support)) {
smsList += askEveryTime
}
return PrimarySimInfo(callsAndSmsList, dataList)
return PrimarySimInfo(callsList, smsList, dataList)
}
private companion object {