Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 660623d8 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add icon logic for 5G SA mode" into rvc-qpr-dev am: df15ada5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160609

Change-Id: I30d1be91c5259a8c6fe57925c82c63e564a57131
parents aeba5fe2 df15ada5

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

+5 −2
Original line number Diff line number Diff line
@@ -284,6 +284,9 @@ public class MobileSignalController extends SignalController< 
        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 @@ public class MobileSignalController extends SignalController< 
            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";

        }