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

Commit fca91266 authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

Merge "Add a branded VPN icon for quick settings and status bar." into nyc-mr1-dev 

am: 0cdb8177

* commit '0cdb8177':
  Add a branded VPN icon for quick settings and status bar.

Change-Id: I61b79cb9b3007116ad8b6c37987f511f1c623ddf
parents 6bf97365 0cdb8177

packages/SystemUI/res/drawable/ic_qs_branded_vpn.xml

0 → 100644
+24 −0
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.700000,10.000000c-0.800000,-2.300000 -3.000000,-4.000000 -5.700000,-4.000000c-3.300000,0.000000 -6.000000,2.700000 -6.000000,6.000000s2.700000,6.000000 6.000000,6.000000c2.600000,0.000000 4.800000,-1.700000 5.700000,-4.000000L17.000000,14.000000l0.000000,4.000000l4.000000,0.000000l0.000000,-4.000000l2.000000,0.000000l0.000000,-4.000000L12.700000,10.000000zM7.000000,14.000000c-1.100000,0.000000 -2.000000,-0.900000 -2.000000,-2.000000c0.000000,-1.100000 0.900000,-2.000000 2.000000,-2.000000s2.000000,0.900000 2.000000,2.000000C9.000000,13.100000 8.100000,14.000000 7.000000,14.000000z"/>

</vector>

packages/SystemUI/res/drawable/stat_sys_branded_vpn.xml

0 → 100644
+28 −0
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.

-->

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

    android:insetLeft="2.5dp"

    android:insetRight="2.5dp">

    <vector android:width="18dp"

            android:height="18dp"

            android:viewportWidth="24.0"

            android:viewportHeight="24.0">



        <path

            android:fillColor="#FFFFFFFF"

            android:pathData="M12.0,17.273l6.1800003,3.7269993 -1.6350002,-7.0290003 5.455,-4.7269993 -7.191,-0.6170006 -2.809,-6.627 -2.809,6.627 -7.191,0.6170006 5.455,4.7269993 -1.6349998,7.0290003z"/>

    </vector>

</inset>

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

+11 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.app.AlertDialog; 
import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.graphics.drawable.Drawable;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;
@@ -57,6 +58,7 @@ public class QSFooter implements OnClickListener, DialogInterface.OnClickListene 
    private boolean mIsVisible;

    private boolean mIsIconVisible;

    private int mFooterTextId;

    private int mFooterIconId;



    public QSFooter(QSPanel qsPanel, Context context) {

        mRootView = LayoutInflater.from(context)
@@ -64,6 +66,7 @@ public class QSFooter implements OnClickListener, DialogInterface.OnClickListene 
        mRootView.setOnClickListener(this);

        mFooterText = (TextView) mRootView.findViewById(R.id.footer_text);

        mFooterIcon = (ImageView) mRootView.findViewById(R.id.footer_icon);

        mFooterIconId = R.drawable.ic_qs_vpn;

        mContext = context;

        mMainHandler = new Handler();

    }
@@ -118,6 +121,14 @@ public class QSFooter implements OnClickListener, DialogInterface.OnClickListene 
            mIsVisible = true;

        } else {

            mFooterTextId = R.string.vpn_footer;

            // Update the VPN footer icon, if needed.

            int footerIconId = (mSecurityController.isVpnBranded()

                ? R.drawable.ic_qs_branded_vpn

                : R.drawable.ic_qs_vpn);

            if (mFooterIconId != footerIconId) {

                mFooterIcon.setImageResource(footerIconId);

                mFooterIconId = footerIconId;

            }

            mIsVisible = mIsIconVisible;

        }

        mMainHandler.post(mUpdateDisplayState);

packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java

+17 −1
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ public class SignalClusterView 


    private boolean mNoSimsVisible = false;

    private boolean mVpnVisible = false;

    private int mVpnIconId = 0;

    private int mLastVpnIconId = -1;

    private boolean mEthernetVisible = false;

    private int mEthernetIconId = 0;

    private int mLastEthernetIconId = -1;
@@ -164,6 +166,7 @@ public class SignalClusterView 
        mSC = sc;

        mSC.addCallback(this);

        mVpnVisible = mSC.isVpnEnabled();

        mVpnIconId = currentVpnIconId(mSC.isVpnBranded());

    }



    @Override
@@ -241,6 +244,7 @@ public class SignalClusterView 
            @Override

            public void run() {

                mVpnVisible = mSC.isVpnEnabled();

                mVpnIconId = currentVpnIconId(mSC.isVpnBranded());

                apply();

            }

        });
@@ -415,6 +419,15 @@ public class SignalClusterView 
        if (mWifiGroup == null) return;



        mVpn.setVisibility(mVpnVisible ? View.VISIBLE : View.GONE);

        if (mVpnVisible) {

            if (mLastVpnIconId != mVpnIconId) {

                setIconForView(mVpn, mVpnIconId);

                mLastVpnIconId = mVpnIconId;

            }

            mVpn.setVisibility(View.VISIBLE);

        } else {

            mVpn.setVisibility(View.GONE);

        }

        if (DEBUG) Log.d(TAG, String.format("vpn: %s", mVpnVisible ? "VISIBLE" : "GONE"));



        if (mEthernetVisible) {
@@ -543,6 +556,10 @@ public class SignalClusterView 
        v.setImageTintList(ColorStateList.valueOf(tint));

    }



    private int currentVpnIconId(boolean isBranded) {

        return isBranded ? R.drawable.stat_sys_branded_vpn : R.drawable.stat_sys_vpn_ic;

    }



    private class PhoneState {

        private final int mSubId;

        private boolean mMobileVisible = false;
@@ -664,4 +681,3 @@ public class SignalClusterView 
        }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ public interface SecurityController { 
    String getProfileOwnerName();

    boolean isVpnEnabled();

    boolean isVpnRestricted();

    /** Whether the VPN app should use branded VPN iconography.  */

    boolean isVpnBranded();

    String getPrimaryVpnName();

    String getProfileVpnName();

    void onUserSwitched(int newUserId);