commit 15fcce4405c64f46794005d67c377fff7980c1a3
author Etan Cohen <etancohen@google.com> Thu Feb 20 17:33:31 2020 -0800
committer Etan Cohen <etancohen@google.com> Sat Feb 22 17:00:08 2020 +0000
tree 49e1f59505f7667df0e78b84dfbebf8d0c30ab6c
parent a1fb6f5b1d9c93f9aeb4086beed753e644ca1a47

[WIFI][SysUI] Update QS iconography for Wi-Fi

Update for:
- No internet: show SSID, show pie + "x" for real bars
- Captive portal: show SSID, same icon as before (empty pie + '?')
- No connection: empty pie

Bug: 136473125
Test: visual test in all above scenarios + normal connectivity
Change-Id: I2f302874de35e83f9530427733d8518becddfa4b

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
index 8bd0f2c..7c96386 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
@@ -88,15 +88,16 @@
         boolean wifiVisible = mCurrentState.enabled
                 && ((mCurrentState.connected && mCurrentState.inetCondition == 1)
                     || !mHasMobileData || visibleWhenEnabled);
-        String wifiDesc = wifiVisible ? mCurrentState.ssid : null;
+        String wifiDesc = mCurrentState.connected ? mCurrentState.ssid : null;
         boolean ssidPresent = wifiVisible && mCurrentState.ssid != null;
         String contentDescription = getTextIfExists(getContentDescription()).toString();
         if (mCurrentState.inetCondition == 0) {
             contentDescription += ("," + mContext.getString(R.string.data_connection_no_internet));
         }
         IconState statusIcon = new IconState(wifiVisible, getCurrentIconId(), contentDescription);
-        IconState qsIcon = new IconState(mCurrentState.connected, getQsCurrentIconId(),
-                contentDescription);
+        IconState qsIcon = new IconState(mCurrentState.connected,
+                mWifiTracker.isCaptivePortal ? R.drawable.ic_qs_wifi_disconnected
+                        : getQsCurrentIconId(), contentDescription);
         callback.setWifiIndicators(mCurrentState.enabled, statusIcon, qsIcon,
                 ssidPresent && mCurrentState.activityIn, ssidPresent && mCurrentState.activityOut,
                 wifiDesc, mCurrentState.isTransient, mCurrentState.statusLabel);