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

Merge "Fix vpn branded string usage" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-22 02:23:04 +00:00
committed by Android (Google) Code Review
parent 3f0d75afe8 59474a40af
commit 9db47b0f49
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
View File

@@ -188,7 +188,8 @@ public class QSFooter implements OnClickListener, DialogInterface.OnClickListene
profileOwner, profileVpn, primaryVpn);
} else {
if (isBranded) {
return mContext.getString(R.string.branded_monitoring_description_app_personal);
return mContext.getString(R.string.branded_monitoring_description_app_personal,
primaryVpn);
} else {
return mContext.getString(R.string.monitoring_description_app_personal,
primaryVpn);