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

Commit 10422896 authored by Anarghya Mitra's avatar Anarghya Mitra
Browse files

Change Quick Settings to account for branded VPNs. 

Screenshots: https://photos.app.goo.gl/FrnK69TXR86npFmY2
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/qs
Bug: 109837832
Change-Id: Ie447e6598ff593ff5d14ec8787db82ba39c9ea54
parent a364b311

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

+8 −3
Original line number Diff line number Diff line
@@ -153,9 +153,14 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic 
                hasCACerts, hasCACertsInWorkProfile, isNetworkLoggingEnabled, vpnName,

                vpnNameWorkProfile, organizationName, workProfileName);

        // Update the icon

        int footerIconId = vpnName != null || vpnNameWorkProfile != null

                ? R.drawable.ic_qs_vpn

                : R.drawable.ic_info_outline;

        int footerIconId = R.drawable.ic_info_outline;

        if (vpnName != null || vpnNameWorkProfile != null) {

            if (mSecurityController.isVpnBranded()) {

                footerIconId = R.drawable.ic_qs_branded_vpn;

            } else {

                footerIconId = R.drawable.ic_qs_vpn;

            }

        }

        if (mFooterIconId != footerIconId) {

            mFooterIconId = footerIconId;

            mMainHandler.post(mUpdateIcon);