Add icon logic for 5G SA mode

Test: manual test with fake NR SA ServiceState
Bug: 153395625
Change-Id: Ic15d2a0ce0fd287f44e244d08ba399f83f6100b7
Merged-In: Ic15d2a0ce0fd287f44e244d08ba399f83f6100b7
(cherry picked from commit e375b1e50c)
This commit is contained in:
Sarah Chin
2020-07-13 16:54:23 -07:00
parent 4c4973248f
commit 10789f19d7

View File

@@ -284,6 +284,9 @@ public class MobileSignalController extends SignalController<
mNetworkToIconLookup.put(toDisplayIconKey( mNetworkToIconLookup.put(toDisplayIconKey(
TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE), TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE),
TelephonyIcons.NR_5G_PLUS); TelephonyIcons.NR_5G_PLUS);
mNetworkToIconLookup.put(toIconKey(
TelephonyManager.NETWORK_TYPE_NR),
TelephonyIcons.NR_5G);
} }
private String getIconKey() { private String getIconKey() {
@@ -306,9 +309,9 @@ public class MobileSignalController extends SignalController<
case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO: case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO:
return toIconKey(TelephonyManager.NETWORK_TYPE_LTE) + "_CA_Plus"; return toIconKey(TelephonyManager.NETWORK_TYPE_LTE) + "_CA_Plus";
case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA: case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA:
return "5G"; return toIconKey(TelephonyManager.NETWORK_TYPE_NR);
case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE: case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE:
return "5G_Plus"; return toIconKey(TelephonyManager.NETWORK_TYPE_NR) + "_Plus";
default: default:
return "unsupported"; return "unsupported";
} }