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

Commit 3d0f8ebc authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Better wifi-enabled signal from network controller."

parents 98508627 a9cc0c03

packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> { 


        boolean wifiConnected = cb.enabled && (cb.wifiSignalIconId > 0) && (cb.enabledDesc != null);

        boolean wifiNotConnected = (cb.wifiSignalIconId > 0) && (cb.enabledDesc == null);

        state.enabled = wifiConnected;

        state.enabled = cb.enabled;

        state.connected = wifiConnected;

        state.activityIn = cb.enabled && cb.activityIn;

        state.activityOut = cb.enabled && cb.activityOut;

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

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        boolean wifiOut = wifiEnabled && mWifiSsid != null

                && (mWifiActivity == WifiManager.DATA_ACTIVITY_INOUT

                || mWifiActivity == WifiManager.DATA_ACTIVITY_OUT);

        cb.onWifiSignalChanged(wifiEnabled, mQSWifiIconId, wifiIn, wifiOut,

        cb.onWifiSignalChanged(mWifiEnabled, mQSWifiIconId, wifiIn, wifiOut,

                mContentDescriptionWifi, wifiDesc);



        boolean mobileIn = mDataConnected && (mDataActivity == TelephonyManager.DATA_ACTIVITY_INOUT