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

Merge "[Wi-Fi] Expose AP Band outside of the Advanced section" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-18 06:13:35 +00:00
committed by Android (Google) Code Review
parent 0581bd7f1c b347128bbf
commit 62b9032b8c
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/xml/all_tether_prefs.xml
View File

@@ -41,16 +41,16 @@
android:title="@string/wifi_hotspot_auto_off_title" android:title="@string/wifi_hotspot_auto_off_title"
android:summary="@string/wifi_hotspot_auto_off_summary"/> android:summary="@string/wifi_hotspot_auto_off_summary"/>
<ListPreference
android:key="wifi_tether_network_ap_band_2"
android:title="@string/wifi_hotspot_ap_band_title"/>
<ListPreference <ListPreference
android:key="wifi_tether_security_2" android:key="wifi_tether_security_2"
android:title="@string/wifi_security" android:title="@string/wifi_security"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:entries="@array/wifi_tether_security" android:entries="@array/wifi_tether_security"
android:entryValues="@array/wifi_tether_security_values"/> android:entryValues="@array/wifi_tether_security_values"/>
<ListPreference
android:key="wifi_tether_network_ap_band_2"
android:title="@string/wifi_hotspot_ap_band_title"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory

8
res/xml/wifi_tether_settings.xml
View File

@@ -37,12 +37,12 @@
android:persistent="false" android:persistent="false"
android:title="@string/wifi_hotspot_password_title"/> android:title="@string/wifi_hotspot_password_title"/>
<ListPreference
android:key="wifi_tether_network_ap_band"
android:title="@string/wifi_hotspot_ap_band_title"/>
<SwitchPreference <SwitchPreference
android:key="wifi_tether_auto_turn_off" android:key="wifi_tether_auto_turn_off"
android:title="@string/wifi_hotspot_auto_off_title" android:title="@string/wifi_hotspot_auto_off_title"
android:summary="@string/wifi_hotspot_auto_off_summary"/> 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> </PreferenceScreen>

4
src/com/android/settings/AllInOneTetherSettings.java
View File

@@ -98,9 +98,9 @@ public class AllInOneTetherSettings extends RestrictedDashboardFragment
public static final String ETHERNET_TETHER_KEY = "enable_ethernet_tethering" + DEDUP_POSTFIX; public static final String ETHERNET_TETHER_KEY = "enable_ethernet_tethering" + DEDUP_POSTFIX;
@VisibleForTesting @VisibleForTesting
static final int EXPANDED_CHILD_COUNT_DEFAULT = 3; static final int EXPANDED_CHILD_COUNT_DEFAULT = 4;
@VisibleForTesting @VisibleForTesting
static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 2; static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 3;
@VisibleForTesting @VisibleForTesting
static final int EXPANDED_CHILD_COUNT_MAX = Integer.MAX_VALUE; static final int EXPANDED_CHILD_COUNT_MAX = Integer.MAX_VALUE;
private static final String TAG = "AllInOneTetherSettings"; private static final String TAG = "AllInOneTetherSettings";

4
src/com/android/settings/wifi/tether/WifiTetherSettings.java
View File

@@ -54,8 +54,8 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
private static final String TAG = "WifiTetherSettings"; private static final String TAG = "WifiTetherSettings";
private static final IntentFilter TETHER_STATE_CHANGE_FILTER; private static final IntentFilter TETHER_STATE_CHANGE_FILTER;
private static final String KEY_WIFI_TETHER_SCREEN = "wifi_tether_settings_screen"; private static final String KEY_WIFI_TETHER_SCREEN = "wifi_tether_settings_screen";
private static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 2; private static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 3;
private static final int EXPANDED_CHILD_COUNT_DEFAULT = 3; private static final int EXPANDED_CHILD_COUNT_DEFAULT = 4;
@VisibleForTesting @VisibleForTesting
static final String KEY_WIFI_TETHER_NETWORK_NAME = "wifi_tether_network_name"; static final String KEY_WIFI_TETHER_NETWORK_NAME = "wifi_tether_network_name";