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

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

Merge "Add icon logic for 5G SA mode" am: 4686f915 am: f0a12b7b 

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

Change-Id: I091d35ef71575896e28ec1baa55bc2cae72f47b8
parents 2d2124a2 f0a12b7b

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -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";

        }

        }