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

Unverified Commit 464609ce authored by Danny Baumann's avatar Danny Baumann Committed by Michael Bestas
Browse files

SystemUI: Add VPN tile 

Allows quickly connecting/disconnecting to/from VPNs.

Change-Id: Iaa9413bf1071805be8764d92bc5e2dd3131fdaed
parent 7f8bc190

core/java/android/net/IVpnManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ interface IVpnManager { 
    /** Legacy VPN APIs */

    void startLegacyVpn(in VpnProfile profile);

    LegacyVpnInfo getLegacyVpnInfo(int userId);

    VpnProfile[] getAllLegacyVpns();

    boolean updateLockdownVpn();



    /** General system APIs */

core/java/android/net/VpnManager.java

+11 −0
Original line number Diff line number Diff line
@@ -717,4 +717,15 @@ public class VpnManager { 
            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * @hide

     */

    public VpnProfile[] getAllLegacyVpns() {

        try {

            return mService.getAllLegacyVpns();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }

}

packages/SystemUI/LineageManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
        package="com.android.systemui">



    <!-- QS Tiles -->

    <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" />

    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />

    <uses-permission android:name="lineageos.permission.HARDWARE_ABSTRACTION_ACCESS" />

packages/SystemUI/res/drawable/ic_qs_vpn.xml

0 → 100644
+27 −0
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="48dp"

        android:height="48dp"

        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/layout/vpn_credentials_dialog.xml

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

<!-- Copyright (C) 2019 The LineageOS 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.

-->



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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:padding="16dp">



    <TextView android:id="@+id/hint"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginBottom="8dp"

            android:textColor="?android:attr/textColorPrimary"

            android:textAppearance="?android:attr/textAppearanceSmall" />



    <TextView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/vpn_credentials_username" />



    <EditText android:id="@+id/username"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:singleLine="true" />



    <TextView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/vpn_credentials_password" />



    <EditText android:id="@+id/password"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:password="true"

            android:singleLine="true" />



</LinearLayout>