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

Commit 9fa7cb71 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove "IT admin" from personal VPN message." into udc-dev am:... 

Merge "Merge "Remove "IT admin" from personal VPN message." into udc-dev am: 21f1cc41 am: 995d1ce0" into udc-d1-dev-plus-aosp
parents 9d66c31b 7c091238

packages/SystemUI/res/values/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -1257,7 +1257,10 @@ 
    <string name="monitoring_description_managed_profile_network_logging">Your admin has turned on network logging, which monitors traffic in your work profile but not in your personal profile.</string>



    <!-- Monitoring dialog: Description of an active VPN. [CHAR LIMIT=NONE]-->

    <string name="monitoring_description_named_vpn">This device is connected to the internet through <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g>. Your network activity, including emails and browsing data, is visible to your IT admin.</string>

    <string name="monitoring_description_named_vpn">This device is connected to the internet through <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g>. Your network activity, including emails and browsing data, is visible to the VPN provider.</string>



    <!-- Monitoring dialog: Description of an active VPN on a managed device. [CHAR LIMIT=NONE]-->

    <string name="monitoring_description_managed_device_named_vpn">This device is connected to the internet through <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g>. Your network activity, including emails and browsing data, is visible to your IT admin.</string>



    <!-- Monitoring dialog: Description of two active VPNs. [CHAR LIMIT=NONE]-->

    <string name="monitoring_description_two_named_vpns">This device is connected to the internet through <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g> and <xliff:g id="vpn_app" example="Bar VPN App">%2$s</xliff:g>. Your network activity, including emails and browsing data, is visible to your IT admin.</string>

packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooterUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -719,7 +719,8 @@ public class QSSecurityFooterUtils implements DialogInterface.OnClickListener { 
                String name = vpnName != null ? vpnName : vpnNameWorkProfile;

                String namedVp = mDpm.getResources().getString(

                        QS_DIALOG_MANAGEMENT_NAMED_VPN,

                        () -> mContext.getString(R.string.monitoring_description_named_vpn, name),

                        () -> mContext.getString(

                                R.string.monitoring_description_managed_device_named_vpn, name),

                        name);

                message.append(namedVp);

            }

packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java

+4 −4
Original line number Diff line number Diff line
@@ -587,14 +587,14 @@ public class QSSecurityFooterTest extends SysuiTestCase { 
        assertEquals(addLink(mContext.getString(R.string.monitoring_description_two_named_vpns,

                                 VPN_PACKAGE, VPN_PACKAGE_2)),

                mFooterUtils.getVpnMessage(false, true, VPN_PACKAGE, VPN_PACKAGE_2));

        assertEquals(addLink(mContext.getString(R.string.monitoring_description_named_vpn,

                                 VPN_PACKAGE)),

        assertEquals(addLink(mContext.getString(

                R.string.monitoring_description_managed_device_named_vpn, VPN_PACKAGE)),

                mFooterUtils.getVpnMessage(true, false, VPN_PACKAGE, null));

        assertEquals(addLink(mContext.getString(R.string.monitoring_description_named_vpn,

                                 VPN_PACKAGE)),

                mFooterUtils.getVpnMessage(false, false, VPN_PACKAGE, null));

        assertEquals(addLink(mContext.getString(R.string.monitoring_description_named_vpn,

                                 VPN_PACKAGE_2)),

        assertEquals(addLink(mContext.getString(

                R.string.monitoring_description_managed_device_named_vpn, VPN_PACKAGE_2)),

                mFooterUtils.getVpnMessage(true, true, null, VPN_PACKAGE_2));

        assertEquals(addLink(mContext.getString(

                                 R.string.monitoring_description_managed_profile_named_vpn,