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

Commit 79b293e8 authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

Merge "Actually read config_showActivity in the signal policy" into pi-dev am: 42b5621e 

am: 346892b4

Change-Id: Id341dd97e5d7699a625fc192af5caa6f3abfe2cf
parents 2b62cab4 346892b4

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java

+1 −4
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba 
        mSlotWifi     = mContext.getString(com.android.internal.R.string.status_bar_wifi);

        mSlotEthernet = mContext.getString(com.android.internal.R.string.status_bar_ethernet);

        mSlotVpn      = mContext.getString(com.android.internal.R.string.status_bar_vpn);

        mActivityEnabled = mContext.getResources().getBoolean(R.bool.config_showActivity);



        mIconController = iconController;

        mNetworkController = Dependency.get(NetworkController.class);
@@ -108,10 +109,6 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba 
        return isBranded ? R.drawable.stat_sys_branded_vpn : R.drawable.stat_sys_vpn_ic;

    }



    private void updateActivityEnabled() {

        mActivityEnabled = mContext.getResources().getBoolean(R.bool.config_showActivity);

    }



    /**

     * From SecurityController

     */