diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d47a30af3683badc55109f063dcee4a4d4347fbc..71d58d038b21f2bb2d7672c8c02bb28973cbe219 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,3 +1,18 @@
+<!-- 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"
diff --git a/res/drawable/ic_wifi_tethering.xml b/res/drawable/ic_wifi_tethering.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3dcd447f9b93cf685961faaee87d42ef7dfbfc03
--- /dev/null
+++ b/res/drawable/ic_wifi_tethering.xml
@@ -0,0 +1,25 @@
+<!--
+    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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
old mode 100644
new mode 100755
index 684fb28754ab32f7e6e926a9b0bce28811655665..74c171e92bdd5658a77115c7e78e6c6fe14b5ed7
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,5 +1,7 @@
 <?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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bc69cfa0760948da3ebdb8fbbec9a83f6a262b08..e85ab32bbd9648687eb538657ff1266a1be975a2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,7 @@
 <?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>
diff --git a/res/xml/dns_settings.xml b/res/xml/dns_settings.xml
new file mode 100755
index 0000000000000000000000000000000000000000..24e17f8ea60d2b8deff36ec8e084ff2f15d8bb87
--- /dev/null
+++ b/res/xml/dns_settings.xml
@@ -0,0 +1,54 @@
+<?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>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 42ca9f07cefe9c8d4e2861aa3a99c4ad88645b8c..789dbbff3e4d39dc3ebff7f42d870e4e4503bf51 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2008 The Android Open Source Project
+	 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.
@@ -43,6 +44,13 @@
         settings:userRestriction="no_config_vpn"
         settings:useAdminDisabledSummary="true" />
 
+	<com.android.settingslib.RestrictedPreference
+        android:fragment="com.android.settings.dns.DNSSettings"
+        android:key="e_dns_settings"
+        android:title="@string/e_dns_mode"
+        settings:userRestriction="no_config_vpn"
+        settings:useAdminDisabledSummary="true" />
+
     <com.android.settingslib.RestrictedPreference
         android:key="mobile_network_settings"
         android:title="@string/network_settings_title"
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 0f1db7523eea7fa57e0e15f0af9f5be2d4ddefec..a8791a7c2b38c24c79d274153172f80bd63faca3 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2008 The Android Open Source Project
  * Copyright (C) 2016 The CyanogenMod Project
+ * 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.
@@ -34,6 +35,7 @@ public class Settings extends SettingsActivity {
     public static class SimSettingsActivity extends SettingsActivity { /* empty */ }
     public static class TetherSettingsActivity extends SettingsActivity { /* empty */ }
     public static class VpnSettingsActivity extends SettingsActivity { /* empty */ }
+	public static class DNSSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DateTimeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class StorageSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PrivateVolumeForgetActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 1872d80e9c36c1009b1befe9d70069b2ca76ac45..b83f6f9c956f1713793d5e7a4c03cab08301eabe 100755
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2014 The Android Open Source Project
+ * 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.
@@ -124,6 +125,7 @@ import com.android.settings.sim.SimSettings;
 import com.android.settings.tts.TextToSpeechSettings;
 import com.android.settings.users.UserSettings;
 import com.android.settings.vpn2.VpnSettings;
+import com.android.settings.dns.DNSSettings;
 import com.android.settings.wfd.WifiDisplaySettings;
 import com.android.settings.widget.SwitchBar;
 import com.android.settings.wifi.AdvancedWifiSettings;
@@ -283,6 +285,7 @@ public class SettingsActivity extends SettingsDrawerActivity
             TetherSettings.class.getName(),
             WifiP2pSettings.class.getName(),
             VpnSettings.class.getName(),
+			DNSSettings.class.getName(),
             DateTimeSettings.class.getName(),
             LocaleListEditor.class.getName(),
             InputMethodAndLanguageSettings.class.getName(),
diff --git a/src/com/android/settings/dns/DNSSettings.java b/src/com/android/settings/dns/DNSSettings.java
new file mode 100755
index 0000000000000000000000000000000000000000..e70932acbee79eb3bc9c74805c0b301c36f4abee
--- /dev/null
+++ b/src/com/android/settings/dns/DNSSettings.java
@@ -0,0 +1,232 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.dns;
+
+import android.content.Context;
+
+import android.os.UserHandle;
+
+//import android.content.pm.PackageManager;
+
+import android.provider.Settings;
+
+import com.android.settings.SettingsPreferenceFragment;
+import android.view.View.OnClickListener;
+import android.content.DialogInterface;
+import com.android.settings.search.Indexable;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
+
+
+import com.android.settings.widget.ToggleSwitch;
+
+import com.android.settings.R;
+
+import android.os.Bundle;
+import android.content.Intent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+
+import android.support.v7.preference.EditTextPreference;
+import android.support.v7.preference.TwoStatePreference;
+
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.EditTextPreference;
+
+import android.util.Log;
+
+
+import android.net.NetworkAgent;
+import android.net.NetworkInfo;
+
+import android.net.ConnectivityManager;
+
+
+import android.net.NetworkUtils;
+
+import java.net.Inet4Address;
+
+import android.os.UserManager;
+
+import android.net.wifi.WifiManager;
+import android.telephony.TelephonyManager;
+import java.lang.reflect.Method;
+
+import com.android.settings.RestrictedSettingsFragment;
+
+import static android.provider.Settings.System.VIBRATE_WHEN_RINGING;
+
+public class DNSSettings extends RestrictedSettingsFragment
+        implements OnPreferenceChangeListener /*Preference.OnPreferenceClickListener*/ {
+
+    private static final String TAG = "DNSSettings";
+
+    private static final String KEY_E_TOGGLE_DNS = "toggle_e_dns";
+    private final static String KEY_E_DNS_VALUE = "e_dns_value";
+
+    private SwitchPreference useNetworkDNS;
+    private EditTextPreference	overrideDNSIPV4;
+
+    private static final String USE_NETWORK_DNS = "USE_NETWORK_DNS";
+    private static final String OVERRIDE_DNS_IP_V4 = "OVERRIDE_DNS_IP_V4"; // IPV4 DNS TO USE.
+
+    private String dnsNotSet; // Default value
+
+	public DNSSettings() {
+		super(UserManager.DISALLOW_CONFIG_VPN);
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsEvent.VPN;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+		//pm = getActivity().getPackageManager();
+
+		dnsNotSet = getResources().getString(R.string.e_dns_not_set);
+
+		addPreferencesFromResource(R.xml.dns_settings);
+		useNetworkDNS = (SwitchPreference) findPreference(KEY_E_TOGGLE_DNS);
+
+		overrideDNSIPV4 = (EditTextPreference) findPreference(KEY_E_DNS_VALUE);
+
+		for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
+			getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);
+		}
+
+		int useNwDNS = Settings.System.getInt(getContext().getContentResolver(), USE_NETWORK_DNS, 1);
+		((TwoStatePreference) useNetworkDNS).setChecked(useNwDNS == 1);
+		
+		String s = Settings.System.getString(getContext().getContentResolver(), OVERRIDE_DNS_IP_V4);
+		overrideDNSIPV4.setText(checkNull(s));
+    }
+
+    private final String checkNull(String value) {
+        if (value == null || value.length() == 0) {
+            return dnsNotSet;
+        } else {
+            return value;
+        }
+    }
+
+    private final Inet4Address getIPv4Address(String text) {
+        try {
+            return (Inet4Address) NetworkUtils.numericToInetAddress(text);
+        } catch (IllegalArgumentException | ClassCastException e) {
+            return null;
+        }
+    }
+
+/*
+	@Override
+    public boolean onPreferenceClick(Preference preference) {
+		return true;
+	}
+*/
+
+	@Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+
+		final String key = preference.getKey();
+
+		if (KEY_E_TOGGLE_DNS.equals(key)) {
+			final boolean val = (Boolean) newValue;
+		    boolean result = Settings.System.putInt(getContext().getContentResolver(), USE_NETWORK_DNS, val ? 1 : 0);
+			resartNetworks();
+			return result;
+
+		}
+		if (KEY_E_DNS_VALUE.equals(key)) {
+			final String val = (String) newValue;
+			final Inet4Address ipAddress = getIPv4Address(val);
+			if (ipAddress != null) {
+				overrideDNSIPV4.setText(checkNull(val));
+			    boolean result = Settings.System.putString(getContext().getContentResolver(), OVERRIDE_DNS_IP_V4, val);
+				resartNetworks();
+				return result;
+			}
+			overrideDNSIPV4.setText(checkNull(dnsNotSet));
+		}
+
+		//new NetworkInfo(ConnectivityManager.TYPE_BLUETOOTH, 0, NETWORK_TYPE, "");
+		return false;
+    }
+
+	private final void resartNetworks(){
+
+		ConnectivityManager connectivitymanager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+ 
+		NetworkInfo[] networkInfo = connectivitymanager.getAllNetworkInfo();
+		 
+		for (NetworkInfo netInfo : networkInfo) {
+		 
+			if (netInfo.getTypeName().equalsIgnoreCase("WIFI")) {
+			 
+				if (netInfo.isConnected()){
+					WifiManager wifiManager = (WifiManager) this.getSystemService(Context.WIFI_SERVICE);
+					//boolean wifiEnabled = wifiManager.isWifiEnabled();
+					//Log.v(TAG, "Wi-Fi state>"+wifiEnabled);
+					//if (wifiEnabled) {		
+						wifiManager.setWifiEnabled(false);
+						wifiManager.setWifiEnabled(true);
+					//}
+				} else {
+				
+				}
+					
+
+			}
+			 
+			if (netInfo.getTypeName().equalsIgnoreCase("MOBILE")) {
+			 
+				if (netInfo.isConnected()){
+					Intent intent = new Intent();
+					intent.setComponent(new android.content.ComponentName("com.android.settings", "com.android.settings.Settings$DataUsageSummaryActivity"));
+					startActivity(intent);
+				} else {
+
+				}
+				 
+			
+			}
+		}
+
+	}
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+
+}