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

Merge "Set Phone number format as LTR" into main

Browse Source
This commit is contained in:
SongFerng Wang
2024-04-17 08:59:26 +00:00
committed by Android (Google) Code Review
parent 082303508b 3219f6da97
commit 27e947f729
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/SubscriptionRepository.kt
View File

@@ -68,7 +68,7 @@ fun Context.isSubscriptionEnabledFlow(subId: Int) = subscriptionsChangedFlow().m
.flowOn(Dispatchers.Default) .flowOn(Dispatchers.Default)
fun Context.phoneNumberFlow(subscriptionInfo: SubscriptionInfo) = subscriptionsChangedFlow().map { fun Context.phoneNumberFlow(subscriptionInfo: SubscriptionInfo) = subscriptionsChangedFlow().map {
SubscriptionUtil.getFormattedPhoneNumber(this, subscriptionInfo) SubscriptionUtil.getBidiFormattedPhoneNumber(this, subscriptionInfo)
}.filterNot { it.isNullOrEmpty() }.flowOn(Dispatchers.Default) }.filterNot { it.isNullOrEmpty() }.flowOn(Dispatchers.Default)
fun Context.subscriptionsChangedFlow() = callbackFlow { fun Context.subscriptionsChangedFlow() = callbackFlow {

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

@@ -43,7 +43,7 @@ class PrimarySimRepository(private val context: Context) {
val item = ListPreferenceOption( val item = ListPreferenceOption(
id = info.subscriptionId, id = info.subscriptionId,
text = "${info.displayName}", text = "${info.displayName}",
summary = SubscriptionUtil.getFormattedPhoneNumber(context, info) ?: "", summary = SubscriptionUtil.getBidiFormattedPhoneNumber(context, info) ?: "",
) )
callsAndSmsList += item callsAndSmsList += item
dataList += item dataList += item