Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be774681 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

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

parents eca66d03 f50ba4c6

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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] -->

src/com/android/settings/vpn2/AppDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -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);