PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update VPN app dialog message to include version code" into main

Browse Source
This commit is contained in:
SongFerng Wang
2024-10-14 03:37:58 +00:00
committed by Android (Google) Code Review
parent eca66d0379 f50ba4c6ec
commit be77468166
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -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] -->

2
src/com/android/settings/vpn2/AppDialog.java
View File

@@ -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);