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

Commit 4f04151e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Statusbar: Show wifi icon on wifi enabled"

parents 60b32710 13853bb7

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

+5 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


package com.android.systemui.statusbar.policy;



import android.app.AppOpsManager;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -63,6 +64,8 @@ public class NetworkController extends BroadcastReceiver implements DemoMode { 


    private static final int FLIGHT_MODE_ICON = R.drawable.stat_sys_signal_flightmode;



    boolean mAppOpsStrictEnabled = false;



    // telephony

    boolean mHspaDataDistinguishable;

    private TelephonyManager mPhone;
@@ -301,7 +304,7 @@ public class NetworkController extends BroadcastReceiver implements DemoMode { 
        if (mDemoMode) return;

        cluster.setWifiIndicators(

                // only show wifi in the cluster if connected or if wifi-only

                mWifiEnabled && (mWifiConnected || !mHasMobileDataFeature),

                mWifiEnabled && (mWifiConnected || !mHasMobileDataFeature || mAppOpsStrictEnabled),

                mWifiIconId,

                mContentDescriptionWifi);
@@ -912,6 +915,7 @@ public class NetworkController extends BroadcastReceiver implements DemoMode { 
    }



    protected void updateWifiIcons() {

        mAppOpsStrictEnabled = AppOpsManager.isStrictEnable();

        if (mWifiConnected) {

            mWifiIconId = WifiIcons.WIFI_SIGNAL_STRENGTH[mInetCondition][mWifiLevel];

            mQSWifiIconId = WifiIcons.QS_WIFI_SIGNAL_STRENGTH[mInetCondition][mWifiLevel];