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 am: 62b9032b8c am: 69e12a0f05 am: 3f3673f79e

Browse Source 
Change-Id: Id76bf4d74b1abfb35596381940f73bfbad3a8ec0
This commit is contained in:
TreeHugger Robot
2020-05-18 07:02:01 +00:00
committed by Automerger Merge Worker
parent 058881001f 3f3673f79e
commit 4ee6e5c70d
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: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
android:key="wifi_tether_security_2"
android:title="@string/wifi_security"
android:summary="@string/summary_placeholder"
android:entries="@array/wifi_tether_security"
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

8
res/xml/wifi_tether_settings.xml
View File

@@ -37,12 +37,12 @@
android:persistent="false"
android:title="@string/wifi_hotspot_password_title"/>
<ListPreference
android:key="wifi_tether_network_ap_band"
android:title="@string/wifi_hotspot_ap_band_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>

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;
@VisibleForTesting
static final int EXPANDED_CHILD_COUNT_DEFAULT = 3;
static final int EXPANDED_CHILD_COUNT_DEFAULT = 4;
@VisibleForTesting
static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 2;
static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 3;
@VisibleForTesting
static final int EXPANDED_CHILD_COUNT_MAX = Integer.MAX_VALUE;
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 IntentFilter TETHER_STATE_CHANGE_FILTER;
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_DEFAULT = 3;
private static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 3;
private static final int EXPANDED_CHILD_COUNT_DEFAULT = 4;
@VisibleForTesting
static final String KEY_WIFI_TETHER_NETWORK_NAME = "wifi_tether_network_name";