Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69e12a0f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I7fc5cf34086826e5421a9a3cc7a5a1fe88521269
parents 51e997cf 62b9032b

res/xml/all_tether_prefs.xml

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

res/xml/wifi_tether_settings.xml

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

src/com/android/settings/AllInOneTetherSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -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";

src/com/android/settings/wifi/tether/WifiTetherSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -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";