Commit 88a57ee9 authored by frank PREEL's avatar frank PREEL Committed by Romain Hunault

DNS UI

parent 1ec5e121
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 2007 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.
You may obtain a copy of the License at
......@@ -4157,4 +4157,14 @@
<!-- /e/ specific changes -->
<string name="micro_g">"MicroG"</string>
<!-- /e/ -->
<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>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Copyright (C) 2019 e.foundation
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.
You may obtain a copy of the License at
......@@ -10088,7 +10090,19 @@
<!-- Title for Connected device shortcut [CHAR LIMIT=30] -->
<string name="devices_title">Devices</string>
<!-- /e/ specific changes -->
<!-- /e/ specific changes -->
<string name="micro_g">MicroG</string>
<string name="open_keychain">OpenKeychain</string>
<!-- /e/ -->
<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>
<?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>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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.
......@@ -76,6 +77,14 @@
settings:controller="com.android.settings.network.AirplaneModePreferenceController"
settings:platform_slice="true"
settings:userRestriction="no_airplane_mode"/>
<com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.dns.DNSSettings"
android:key="e_dns_settings"
android:title="@string/e_dns_mode"
android:icon="@drawable/ic_settings"
android:order="0"
android:summary="@string/e_dns_summary"/>
<Preference
android:fragment="com.android.settings.ProxySelector"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment