From 99001c7c75183d166ba72e8dc2021730a5bb9896 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Fri, 10 Sep 2021 11:09:36 +0800 Subject: [PATCH] [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 --- .../qs/tiles/dialog/InternetDialogController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java index 70f52ad5432d8..50e7e43822ea5 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java @@ -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) : ""; }