PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev am: be76ebdc5b am: 758b0317ad

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552288

Change-Id: Ic5be47e2240a4ece4853a2e772142c0bdeea7f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-13 08:56:32 +00:00
committed by Automerger Merge Worker
parent 47aaf4827b 758b0317ad
commit a50f75532a
14 changed files with 1019 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
res/xml/wifi_hotspot_security.xml Normal file
View File

@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/wifi_security"
settings:searchable="false">
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="wifi_hotspot_security_wpa3"
android:title="@string/wifi_security_sae"/>
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="wifi_hotspot_security_wpa2_wpa3"
android:title="@string/wifi_security_psk_sae"/>
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="wifi_hotspot_security_wpa2"
android:title="@string/wifi_security_wpa2"/>
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="wifi_hotspot_security_none"
android:title="@string/wifi_security_none"/>
<com.android.settingslib.widget.FooterPreference
android:title="@string/wifi_hotspot_security_footer"/>
</PreferenceScreen>

7
res/xml/wifi_tether_settings.xml
View File

@@ -32,6 +32,13 @@
android:entries="@array/wifi_tether_security"
android:entryValues="@array/wifi_tether_security_values"/>
<Preference
android:key="wifi_hotspot_security"
android:title="@string/wifi_security"
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.wifi.tether.WifiHotspotSecuritySettings"
settings:isPreferenceVisible="@bool/config_show_wifi_hotspot_speed"/>
<com.android.settings.widget.ValidatedEditTextPreference
android:key="wifi_tether_network_password"
android:persistent="false"