We decided to use the list preference after all due to some devices not supporting various combinations of AP configurations. This change makes it so that there are three different UIs depending on the configurations which are supported. - 5.0 GHz unsupported: disable the preference and just set the value to 2.4 GHz - all supported, no dual mode: allow the user to choose EITHER 2.4 GHz or 5.0 GHz - all supported, dual mode: allow the user to choose 2.4 GHz or BOTH 2.4 GHz & 5.0 GHz with 5.0 being preferred Test: atest SettingsRoboTests Bug: 80315296 Change-Id: I888d35811a98b8cf0155a3cb96c42ff762763378 Merged-In: I888d35811a98b8cf0155a3cb96c42ff762763378
49 lines
1.9 KiB
XML
49 lines
1.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
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.
|
|
-->
|
|
|
|
<PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:title="@string/wifi_hotspot_checkbox_text"
|
|
settings:initialExpandedChildrenCount="3">
|
|
|
|
<com.android.settings.widget.ValidatedEditTextPreference
|
|
android:key="wifi_tether_network_name"
|
|
android:title="@string/wifi_hotspot_name_title"
|
|
android:summary="@string/summary_placeholder" />
|
|
|
|
<ListPreference
|
|
android:key="wifi_tether_security"
|
|
android:title="@string/wifi_security"
|
|
android:summary="@string/summary_placeholder"
|
|
android:entries="@array/wifi_tether_security"
|
|
android:entryValues="@array/wifi_tether_security_values" />
|
|
|
|
<com.android.settings.widget.ValidatedEditTextPreference
|
|
android:key="wifi_tether_network_password"
|
|
android:persistent="false"
|
|
android:title="@string/wifi_hotspot_password_title" />
|
|
|
|
<SwitchPreference
|
|
android:key="wifi_tether_auto_turn_off"
|
|
android:title="@string/wifi_hotspot_auto_off_title"
|
|
android:summary="@string/wifi_hotspot_auto_off_summary" />
|
|
|
|
<ListPreference
|
|
android:key="wifi_tether_network_ap_band"
|
|
android:title="@string/wifi_hotspot_ap_band_title" />
|
|
</PreferenceScreen> |