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

Commit 99001c7c authored by Zoey Chen's avatar Zoey Chen
Browse files

[Provider Model] Show W+ when connected to Carrier Wi-Fi Network 

Sync solution from InternetPanel(ag/14456005 and ag/14934760)

Bug: 199199709
Test:
adb root
adb shell cmd wifi network-suggestions-set-as-carrier-provider com.android.shell yes
adb shell cmd wifi add-suggestion GoogleGuest-Legacy open -a -m -i 2 -c 1989

Change-Id: I933c051138e56a5d08378cc1e51d9a577b3c1eae
parent 51f1231c

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java

+10 −0
Original line number Diff line number Diff line
@@ -58,9 +58,11 @@ import com.android.internal.logging.UiEventLogger; 
import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitorCallback;

import com.android.settingslib.DeviceInfoUtils;

import com.android.settingslib.SignalIcon;

import com.android.settingslib.Utils;

import com.android.settingslib.graph.SignalDrawable;

import com.android.settingslib.mobile.MobileMappings;

import com.android.settingslib.mobile.TelephonyIcons;

import com.android.settingslib.net.SignalStrengthUtil;

import com.android.settingslib.wifi.WifiUtils;

import com.android.systemui.R;
@@ -534,6 +536,14 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, 
        }



        int resId = mapIconSets(config).get(iconKey).dataContentDescription;

        final MergedCarrierEntry mergedCarrierEntry =

                mAccessPointController.getMergedCarrierEntry();

        if (mergedCarrierEntry != null && mergedCarrierEntry.isDefaultNetwork()) {

            SignalIcon.MobileIconGroup carrierMergedWifiIconGroup =

                    TelephonyIcons.CARRIER_MERGED_WIFI;

            resId = carrierMergedWifiIconGroup.dataContentDescription;

        }



        return resId != 0

                ? SubscriptionManager.getResourcesForSubId(context, subId).getString(resId) : "";

    }