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

Get icon id from CellIdentity instead of CellInfo

Browse Source 
Currently NetworkSelectSettings.forceUpdateConnectedPreferenceCategory()
only pass CellIdentity, but not the CellInfo.

Get icon id from CellIdentity to fix.

Fix: 336238346
Test: visual - on NetworkSelectSettings
Change-Id: Ia30a45eef9d55815c8a45629c86cf83a6a480868
This commit is contained in:
Chaohui Wang
2024-04-23 17:22:24 +08:00
parent 174acf5c67
commit dae4c04b74
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/network/telephony/NetworkOperatorPreference.kt
View File

@@ -19,6 +19,12 @@ package com.android.settings.network.telephony
import android.content.Context import android.content.Context
import android.telephony.AccessNetworkConstants.AccessNetworkType import android.telephony.AccessNetworkConstants.AccessNetworkType
import android.telephony.CellIdentity import android.telephony.CellIdentity
import android.telephony.CellIdentityCdma
import android.telephony.CellIdentityGsm
import android.telephony.CellIdentityLte
import android.telephony.CellIdentityNr
import android.telephony.CellIdentityTdscdma
import android.telephony.CellIdentityWcdma
import android.telephony.CellInfo import android.telephony.CellInfo
import android.telephony.CellInfoCdma import android.telephony.CellInfoCdma
import android.telephony.CellInfoGsm import android.telephony.CellInfoGsm
@@ -120,17 +126,17 @@ open class NetworkOperatorPreference(
getAccessNetworkTypeFromCellInfo(), getAccessNetworkTypeFromCellInfo(),
) )
private fun getIconIdForCell(): Int = when (cellInfo) { private fun getIconIdForCell(): Int = when (cellId) {
is CellInfoGsm -> R.drawable.signal_strength_g is CellIdentityGsm -> R.drawable.signal_strength_g
is CellInfoCdma -> R.drawable.signal_strength_1x is CellIdentityCdma -> R.drawable.signal_strength_1x
is CellInfoWcdma, is CellInfoTdscdma -> R.drawable.signal_strength_3g is CellIdentityWcdma, is CellIdentityTdscdma -> R.drawable.signal_strength_3g
is CellInfoLte -> { is CellIdentityLte -> {
if (show4GForLTE) R.drawable.ic_signal_strength_4g if (show4GForLTE) R.drawable.ic_signal_strength_4g
else R.drawable.signal_strength_lte else R.drawable.signal_strength_lte
} }
is CellInfoNr -> R.drawable.signal_strength_5g is CellIdentityNr -> R.drawable.signal_strength_5g
else -> MobileNetworkUtils.NO_CELL_DATA_TYPE_ICON else -> MobileNetworkUtils.NO_CELL_DATA_TYPE_ICON
} }