commit 10789f19d79cb35dadb495ab8b58071cc5af59a5
author Sarah Chin <sarahchin@google.com> Mon Jul 13 16:54:23 2020 -0700
committer Sarah Chin <sarahchin@google.com> Wed Jul 15 18:51:38 2020 +0000
tree 93f3884c32406920bf4ab4718cf7e20455eb0edd
parent 4c4973248f967a3b49769c7358a524f6a9b61759

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 e375b1e50c25bee8f03ff2bf0f58072a64c81ddc)

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
index 18a7add..cf83603 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
@@ -284,6 +284,9 @@
         mNetworkToIconLookup.put(toDisplayIconKey(
                 TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE),
                 TelephonyIcons.NR_5G_PLUS);
+        mNetworkToIconLookup.put(toIconKey(
+                TelephonyManager.NETWORK_TYPE_NR),
+                TelephonyIcons.NR_5G);
     }
 
     private String getIconKey() {
@@ -306,9 +309,9 @@
             case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO:
                 return toIconKey(TelephonyManager.NETWORK_TYPE_LTE) + "_CA_Plus";
             case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA:
-                return "5G";
+                return toIconKey(TelephonyManager.NETWORK_TYPE_NR);
             case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE:
-                return "5G_Plus";
+                return toIconKey(TelephonyManager.NETWORK_TYPE_NR) + "_Plus";
             default:
                 return "unsupported";
         }