Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 346892b4ae

Change-Id: Id341dd97e5d7699a625fc192af5caa6f3abfe2cf
This commit is contained in:
Evan Laird
2018-04-23 11:57:43 -07:00
committed by android-build-merger
parent 2b62cab424 346892b4ae
commit 79b293e84f
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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