Merge "Update VPN app dialog message to include version code" into main
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a11acb0..1f9aa61 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6957,6 +6957,8 @@
<string name="vpn_disconnect">Disconnect</string>
<!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
<string name="vpn_version">Version</string>
+ <!-- Field label to show the version number for a VPN app dialog. [CHAR LIMIT=40] -->
+ <string name="vpn_version_info">Version <xliff:g id="version" example="3.3.0">%s</xliff:g></string>
<!-- Button label to forget a VPN profile [CHAR LIMIT=40] -->
<string name="vpn_forget_long">Forget VPN</string>
<!-- Dialog message title to set another VPN app to be always-on [CHAR LIMIT=40] -->
diff --git a/src/com/android/settings/vpn2/AppDialog.java b/src/com/android/settings/vpn2/AppDialog.java
index 815b28b..b122999 100644
--- a/src/com/android/settings/vpn2/AppDialog.java
+++ b/src/com/android/settings/vpn2/AppDialog.java
@@ -56,7 +56,7 @@
@Override
protected void onCreate(Bundle savedState) {
setTitle(mLabel);
- setMessage(getContext().getString(R.string.vpn_version, mPackageInfo.versionName));
+ setMessage(getContext().getString(R.string.vpn_version_info, mPackageInfo.versionName));
createButtons();
super.onCreate(savedState);