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

Commit bb8346e7 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Always show full strength for wifi quick toggle"

parents 9477229f f117961c

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

+20 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.qs.tiles;



import com.android.systemui.qs.QSTileView;

import com.android.systemui.statusbar.policy.WifiIcons;



/** Quick settings tile: Wifi **/

public class QWifiTile extends WifiTile {
@@ -29,4 +30,23 @@ public class QWifiTile extends WifiTile { 
    public int getTileType() {

        return QSTileView.QS_TYPE_QUICK;

    }



    @Override

    protected void handleUpdateState(SignalState state, Object arg) {

        super.handleUpdateState(state, arg);



        CallbackInfo cb = (CallbackInfo) arg;

        if (cb == null) {

            cb = mSignalCallback.mInfo;

        }

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



        if (state.enabled && wifiConnected) {

            // Only show full signal here.

            state.icon = ResourceIcon.get(WifiIcons.QS_WIFI_SIGNAL_STRENGTH[1][4]);

        }

        // No activity in the quick toggle.

        state.activityIn = false;

        state.activityOut = false;

    }

}

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

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> { 
    private final WifiDetailAdapter mDetailAdapter;

    private final QSTile.SignalState mStateBeforeClick = newTileState();



    private final WifiSignalCallback mSignalCallback = new WifiSignalCallback();

    protected final WifiSignalCallback mSignalCallback = new WifiSignalCallback();



    private final boolean mAlwaysDetail;
@@ -200,7 +200,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> { 
        return string;

    }



    private static final class CallbackInfo {

    protected static final class CallbackInfo {

        boolean enabled;

        boolean connected;

        int wifiSignalIconId;
@@ -223,7 +223,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> { 
        }

    }



    private final class WifiSignalCallback extends SignalCallbackAdapter {

    protected final class WifiSignalCallback extends SignalCallbackAdapter {

        final CallbackInfo mInfo = new CallbackInfo();



        @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.statusbar.policy; 


import com.android.systemui.R;



class WifiIcons {

public class WifiIcons {

    static final int[][] WIFI_SIGNAL_STRENGTH = {

            { R.drawable.stat_sys_wifi_signal_0,

              R.drawable.stat_sys_wifi_signal_1,
@@ -32,7 +32,7 @@ class WifiIcons { 
              R.drawable.stat_sys_wifi_signal_4_fully }

        };



    static final int[][] QS_WIFI_SIGNAL_STRENGTH = {

    public static final int[][] QS_WIFI_SIGNAL_STRENGTH = {

            { R.drawable.ic_qs_wifi_0,

              R.drawable.ic_qs_wifi_1,

              R.drawable.ic_qs_wifi_2,