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

Commit f3fd130b authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

[DNS] DNS settings UI

parent 76e37f1c

AndroidManifest.xml

+36 −0
Original line number Diff line number Diff line 
<!-- Copyright (C) 2019 e.foundation



     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.

-->



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

        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

        package="com.android.settings"
@@ -556,6 +571,27 @@ 
                android:value="true" />

        </activity>



		<activity android:name="Settings$DNSSettingsActivity"

                android:label="@string/vpn_settings_title"

                android:icon="@drawable/ic_settings_wireless"

                android:taskAffinity="">

            <intent-filter android:priority="1">

                <action android:name="android.settings.VPN_SETTINGS" />

                <action android:name="android.net.vpn.SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.vpn2.VpnSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity android:name="Settings$DateTimeSettingsActivity"

                android:label="@string/date_and_time"

                android:icon="@drawable/ic_settings_date_time"

res/drawable/ic_wifi_tethering.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2017 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="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="@color/blue_1">

    <path

        android:pathData="M12,11c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13a6,6 0,0 0,-6.75 -5.95c-2.62,0.32 -4.78,2.41 -5.18,5.02 -0.32,2.14 0.49,4.11 1.92,5.39 0.48,0.43 1.24,0.33 1.56,-0.23 0.24,-0.42 0.14,-0.94 -0.22,-1.26a3.99,3.99 0,0 1,-1.22 -3.94,3.954 3.954,0 0,1 2.9,-2.91A4.007,4.007 0,0 1,16 13c0,1.18 -0.51,2.23 -1.33,2.96 -0.36,0.33 -0.47,0.85 -0.23,1.27 0.31,0.54 1.04,0.69 1.5,0.28A5.97,5.97 0,0 0,18 13zM10.83,3.07c-4.62,0.52 -8.35,4.33 -8.78,8.96a9.966,9.966 0,0 0,4.02 9.01c0.48,0.35 1.16,0.2 1.46,-0.31 0.25,-0.43 0.14,-0.99 -0.26,-1.29 -2.28,-1.69 -3.65,-4.55 -3.16,-7.7 0.54,-3.5 3.46,-6.29 6.98,-6.68C15.91,4.51 20,8.28 20,13c0,2.65 -1.29,4.98 -3.27,6.44 -0.4,0.3 -0.51,0.85 -0.26,1.29 0.3,0.52 0.98,0.66 1.46,0.31A9.96,9.96 0,0 0,22 13c0,-5.91 -5.13,-10.62 -11.17,-9.93z"

        android:fillColor="#FFFFFFFF"/>

</vector>

res/values-fr/strings.xml

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

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

      Copyright (C) 2018 e.foundation

      Copyright (C) 2019 e.foundation



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

     you may not use this file except in compliance with the License.
@@ -3260,4 +3262,29 @@ 
    <string name="carrier_provisioning" msgid="4398683675591893169">"Informations de gestion des comptes opérateur"</string>

    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher la gestion des comptes opérateur"</string>

    <string name="micro_g">"MicroG"</string>



    <string name="e_dns_settings_title">"Settings DNS"</string>

    <string name="e_dns_mode">"DNS"</string>

    <string name="e_dns_name">"DNS"</string>

    <string name="e_dns_title">"Entrez l'IP du DNS"</string>

    <string name="e_use_dhcp_dns">"Utiliser le DNS du réseau"</string>

    <string name="e_use_dhcp_dns_summary">"Permet d'utiliser le serveur DNS fourni par le réseau"</string>

    <string name="e_dns_name_summary">"Définissez le DNS à utiliser"</string>

    <string name="e_dns_not_set">"9.9.9.9"</string>

    <string name="e_dns_summary">"Configuration du DNS"</string>































</resources>

res/values/strings.xml

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

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

     Copyright (C) 2018 e.foundation

	   Copyright (C) 2019 e.foundation















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















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










@@ -7969,4 +7971,16 @@



























    <string name="elicense_title">/e/ legal</string>



























    <!-- /e/ specific changes -->













    <string name="micro_g">MicroG</string>

























    <string name="e_dns_settings_title">"DNS Settings"</string>













    <string name="e_dns_mode">"DNS"</string>













    <string name="e_dns_name">"DNS"</string>













    <string name="e_dns_title">"Enter DNS IP"</string>













    <string name="e_use_dhcp_dns">"Use network DNS"</string>













    <string name="e_use_dhcp_dns_summary">"Allow to use DNS from network provider"</string>













    <string name="e_dns_name_summary">"Set DNS to use"</string>













    <string name="e_dns_not_set">"9.9.9.9"</string>













    <string name="e_dns_summary">"DNS configuration"</string>















</resources>

























res/xml/dns_settings.xml
0 → 100755



+54
−0






























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!-- Copyright (C) 2019 e.foundation



























     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.













-->



























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













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













        android:title="@string/e_dns_settings_title">













<!--













    <PreferenceCategory













            android:key="user_list"













            android:title="@string/user_list_title">













    </PreferenceCategory>



























    <com.android.settings.DimmableIconPreference













            android:key="user_add"













            android:title="@string/user_add_user_or_profile_menu"













            android:icon="@drawable/ic_menu_add" />













-->



























    <SwitchPreference













        android:key="toggle_e_dns"













        android:title="@string/e_use_dhcp_dns"













        android:summary="@string/e_use_dhcp_dns_summary"













        android:defaultValue="true"













        android:icon="@drawable/ic_wifi_tethering"













        android:disableDependentsState="true"













	android:order="5"/>



























    <EditTextPreference













		android:key="e_dns_value"













		android:icon="@drawable/ic_settings_accounts"        













		android:title="@string/e_dns_name"













		android:summary="@string/e_dns_name_summary"













		android:dependency="toggle_e_dns"













	    android:dialogTitle="@string/e_dns_title"













	    android:singleLine="true"













	    android:inputType="phone"













	    android:persistent="false"













		android:defaultValue="9.9.9.9"	













		android:order="10"/>



























</PreferenceScreen>