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

Commit 283e29f4 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Remove unnecessary VPN icons. 

Added comment to branded VPN icon to indicate that it's statically
overlayed.

Bug: 129398746
Test: make
Change-Id: I077285bc7a40975430195877bf972ebb41cf66de
parent b8e80e0d

packages/SystemUI/res/drawable/ic_qs_branded_vpn.xml

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="12.0dp"

        android:height="12.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#4DFFFFFF"

        android:pathData="M12.09,9C11.11,7.5 9.43,6.5 7.5,6.5C4.46,6.5 2,8.96 2,12c0,3.04 2.46,5.5 5.5,5.5c1.93,0 3.61,-1 4.59,-2.5H14v3h6v-3h2V9H12.09zM20,13h-2v3h-2v-3h-5.16c-0.43,1.44 -1.76,2.5 -3.34,2.5C5.57,15.5 4,13.93 4,12c0,-1.93 1.57,-3.5 3.5,-3.5c1.58,0 2.9,1.06 3.34,2.5H20V13z"/>

    <path

        android:fillColor="#4DFFFFFF"

        android:pathData="M7.5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>

</vector>

packages/SystemUI/res/drawable/ic_qs_vpn.xml

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
<!--

Copyright (C) 2014 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="12.0dp"

        android:height="12.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M12.09,9C11.11,7.5 9.43,6.5 7.5,6.5C4.46,6.5 2,8.96 2,12c0,3.04 2.46,5.5 5.5,5.5c1.93,0 3.61,-1 4.59,-2.5H14v3h6v-3h2V9H12.09zM20,13h-2v3h-2v-3h-5.16c-0.43,1.44 -1.76,2.5 -3.34,2.5C5.57,15.5 4,13.93 4,12c0,-1.93 1.57,-3.5 3.5,-3.5c1.58,0 2.9,1.06 3.34,2.5H20V13z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M7.5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>

</vector>

packages/SystemUI/res/drawable/stat_sys_branded_vpn.xml

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<!-- This icon is statically overlayed - do not remove.-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="17.0dp"

        android:height="17.0dp"

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

+2 −2
Original line number Diff line number Diff line
@@ -160,9 +160,9 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic 
        int footerIconId = R.drawable.ic_info_outline;

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

            if (mSecurityController.isVpnBranded()) {

                footerIconId = R.drawable.ic_qs_branded_vpn;

                footerIconId = R.drawable.stat_sys_branded_vpn;

            } else {

                footerIconId = R.drawable.ic_qs_vpn;

                footerIconId = R.drawable.stat_sys_vpn_ic;

            }

        }

        if (mFooterIconId != footerIconId) {

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

+6 −6
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ public class QSSecurityFooterTest extends SysuiTestCase { 
                                        VPN_PACKAGE),

                     mFooterText.getText());

        assertEquals(View.VISIBLE, mFooterIcon.getVisibility());

        assertEquals(R.drawable.ic_qs_vpn, mFooterIcon.getLastImageResource());

        assertEquals(R.drawable.stat_sys_vpn_ic, mFooterIcon.getLastImageResource());



        // Same situation, but with organization name set

        when(mSecurityController.getDeviceOwnerOrganizationName())
@@ -220,7 +220,7 @@ public class QSSecurityFooterTest extends SysuiTestCase { 
        assertEquals(mContext.getString(R.string.quick_settings_disclosure_management_vpns),

                     mFooterText.getText());

        assertEquals(View.VISIBLE, mFooterIcon.getVisibility());

        assertEquals(R.drawable.ic_qs_vpn, mFooterIcon.getLastImageResource());

        assertEquals(R.drawable.stat_sys_vpn_ic, mFooterIcon.getLastImageResource());



        // Same situation, but with organization name set

        when(mSecurityController.getDeviceOwnerOrganizationName())
@@ -243,7 +243,7 @@ public class QSSecurityFooterTest extends SysuiTestCase { 


        TestableLooper.get(this).processAllMessages();

        assertEquals(View.VISIBLE, mFooterIcon.getVisibility());

        assertEquals(R.drawable.ic_qs_vpn, mFooterIcon.getLastImageResource());

        assertEquals(R.drawable.stat_sys_vpn_ic, mFooterIcon.getLastImageResource());

        assertEquals(mContext.getString(R.string.quick_settings_disclosure_management_monitoring),

                mFooterText.getText());

    }
@@ -294,7 +294,7 @@ public class QSSecurityFooterTest extends SysuiTestCase { 
        mFooter.refreshState();



        TestableLooper.get(this).processAllMessages();

        assertEquals(R.drawable.ic_qs_vpn, mFooterIcon.getLastImageResource());

        assertEquals(R.drawable.stat_sys_vpn_ic, mFooterIcon.getLastImageResource());

        assertEquals(mContext.getString(R.string.quick_settings_disclosure_vpns),

                     mFooterText.getText());

    }
@@ -306,7 +306,7 @@ public class QSSecurityFooterTest extends SysuiTestCase { 
        mFooter.refreshState();



        TestableLooper.get(this).processAllMessages();

        assertEquals(R.drawable.ic_qs_vpn, mFooterIcon.getLastImageResource());

        assertEquals(R.drawable.stat_sys_vpn_ic, mFooterIcon.getLastImageResource());

        assertEquals(mContext.getString(

                             R.string.quick_settings_disclosure_managed_profile_named_vpn,

                             VPN_PACKAGE_2),
@@ -320,7 +320,7 @@ public class QSSecurityFooterTest extends SysuiTestCase { 
        mFooter.refreshState();



        TestableLooper.get(this).processAllMessages();

        assertEquals(R.drawable.ic_qs_vpn, mFooterIcon.getLastImageResource());

        assertEquals(R.drawable.stat_sys_vpn_ic, mFooterIcon.getLastImageResource());

        assertEquals(mContext.getString(R.string.quick_settings_disclosure_named_vpn,

                                        VPN_PACKAGE),

                     mFooterText.getText());