From f50ba4c6ece3ce5d88824a008042b1490adead49 Mon Sep 17 00:00:00 2001
From: SongFerng Wang <songferngwang@google.com>
Date: Fri, 11 Oct 2024 07:55:17 +0000
Subject: [PATCH] Update VPN app dialog message to include version code

Add the string back to AppDialog in VPN

Bug: 372179228
Change-Id: I2f45515623cd7d0fbaf4a17026d040107b804fed
Test: verify the UI.
Flag: EXEMPT bugfix
---
 res/values/strings.xml                       | 2 ++
 src/com/android/settings/vpn2/AppDialog.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a11acb09586..1f9aa617853 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 815b28bf27b..b1229992855 100644
--- a/src/com/android/settings/vpn2/AppDialog.java
+++ b/src/com/android/settings/vpn2/AppDialog.java
@@ -56,7 +56,7 @@ class AppDialog extends AlertDialog implements DialogInterface.OnClickListener {
     @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);