Merge "Actually read config_showActivity in the signal policy" into pi-dev (42b5621e) · Commits · e / os / android_frameworks_base

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
		*/