diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-10-22 02:23:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-22 02:23:07 +0000 |
| commit | 9db47b0f497f8489db408c36a82f8118f43d6566 (patch) | |
| tree | d05c861f3a717e0e3b0344a49dccb197dfa10260 | |
| parent | 3f0d75afe89f29f5352cc67e0dfdfb509bb64383 (diff) | |
| parent | 59474a40af000ab96fd71e5e4f5118940618f050 (diff) | |
| download | base-9db47b0f497f8489db408c36a82f8118f43d6566.tar.gz | |
Merge "Fix vpn branded string usage" into nyc-mr1-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSFooter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java index 4ac629dc1da5..ccb28e95802e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java @@ -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); |