DNS UI (88a57ee9) · Commits · e / os / android_packages_apps_Settings

res/values-fr/strings.xml

+11 −1

Original line number	Diff line number	Diff line
		@@ -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>

res/values/strings.xml

+16 −2

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.
		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 -->
		<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>

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>

res/xml/network_and_internet.xml

+9 −0

Original line number	Diff line number	Diff line
		<?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.
		@@ -77,6 +78,14 @@
		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"
		android:key="proxy_settings"