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

Commit 0608d2dc authored by Ningyuan Wang's avatar Ningyuan Wang Committed by Android (Google) Code Review
Browse files

Merge "Wifi Settings: Add auto option for softap"

parents 475fa504 a8df3064

res/values/arrays.xml

+3 −1
Original line number Diff line number Diff line
@@ -266,14 +266,16 @@ 
        <item>PWD</item>

    </string-array>



   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->

   <!-- Wi-Fi AP band settings.  Either Auto, 2.4GHz or 5GHz. -->

   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->

    <string-array name="wifi_ap_band_config_full">

        <item>@string/wifi_ap_choose_auto</item>

        <item>@string/wifi_ap_choose_2G</item>

        <item>@string/wifi_ap_choose_5G</item>

    </string-array>



    <string-array name="wifi_ap_band_config_2G_only">

        <item>@string/wifi_ap_choose_auto</item>

        <item>@string/wifi_ap_choose_2G</item>

    </string-array>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1941,6 +1941,8 @@ 
    <string name="wifi_show_password">Show password</string>

    <!-- Label for the RadioGroup to choose wifi ap band -->

    <string name="wifi_ap_band_config">Select AP Band</string>

    <!-- Label for the radio button to choose wifi ap channel automatically-->

    <string name="wifi_ap_choose_auto">Auto</string>

    <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->

    <string name="wifi_ap_choose_2G">2.4 GHz Band</string>

    <!-- Label for the radio button to choose wifi ap 5GHz band -->

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

+6 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.wifi.tether; 


import static android.net.wifi.WifiConfiguration.AP_BAND_2GHZ;

import static android.net.wifi.WifiConfiguration.AP_BAND_5GHZ;

import static android.net.wifi.WifiConfiguration.AP_BAND_ANY;



import android.content.Context;

import android.net.wifi.WifiConfiguration;
@@ -32,7 +33,8 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen 
    private static final String TAG = "WifiTetherApBandPref";

    private static final String PREF_KEY = "wifi_tether_network_ap_band";

    private static final String[] BAND_VALUES =

            {String.valueOf(AP_BAND_2GHZ), String.valueOf(AP_BAND_5GHZ)};

            {String.valueOf(AP_BAND_ANY), String.valueOf(AP_BAND_2GHZ),

                    String.valueOf(AP_BAND_5GHZ)};



    private final String[] mBandEntries;

    private int mBandIndex;
@@ -65,7 +67,7 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen 
        } else {

            preference.setEntries(mBandEntries);

            preference.setEntryValues(BAND_VALUES);

            preference.setSummary(mBandEntries[mBandIndex]);

            preference.setSummary(mBandEntries[mBandIndex + 1]);

            preference.setValue(String.valueOf(mBandIndex));

        }

    }
@@ -78,7 +80,8 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen 
    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        mBandIndex = Integer.parseInt((String) newValue);

        preference.setSummary(mBandEntries[mBandIndex]);

        Log.d(TAG, "Band preference changed, updating band index to " + mBandIndex);

        preference.setSummary(mBandEntries[mBandIndex + 1]);

        mListener.onTetherConfigUpdated();

        return true;

    }

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java

+7 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class WifiTetherApBandPreferenceControllerTest { 


        mController.displayPreference(mScreen);



        assertThat(mListPreference.getEntries().length).isEqualTo(2);

        assertThat(mListPreference.getEntries().length).isEqualTo(3);

    }



    @Test
@@ -113,13 +113,18 @@ public class WifiTetherApBandPreferenceControllerTest { 
        when(mWifiManager.is5GHzBandSupported()).thenReturn(true);



        mController.displayPreference(mScreen);



        // -1 is WifiConfiguration.AP_BAND_ANY, for 'Auto' option.

        mController.onPreferenceChange(mListPreference, "-1");

        assertThat(mController.getBandIndex()).isEqualTo(-1);



        mController.onPreferenceChange(mListPreference, "1");

        assertThat(mController.getBandIndex()).isEqualTo(1);



        mController.onPreferenceChange(mListPreference, "0");

        assertThat(mController.getBandIndex()).isEqualTo(0);



        verify(mListener, times(2)).onTetherConfigUpdated();

        verify(mListener, times(3)).onTetherConfigUpdated();

    }



    @Test