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

Commit b945785d authored by Goven Liu's avatar Goven Liu Committed by Android (Google) Code Review
Browse files

Merge "[Wi-Fi] Use new defined proto field for adding new networks panel page."

parents faa90620 cfd8a5d2
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ public class AddAppNetworksFragment extends InstrumentedFragment {
        return inflater.inflate(R.layout.wifi_add_app_networks, container, false);
    }

    // TODO: Makesure function work correctly after rotate.
    @Override
    public void onViewCreated(View view, Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
@@ -585,8 +584,7 @@ public class AddAppNetworksFragment extends InstrumentedFragment {

    @Override
    public int getMetricsCategory() {
        // TODO(b/144891278): Need to define a new metric for this page, use the WIFI item first.
        return SettingsEnums.WIFI;
        return SettingsEnums.PANEL_ADD_WIFI_NETWORKS;
    }

    private void showSaveStatusByState(int status) {
+7 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;

import android.app.settings.SettingsEnums;
import android.net.wifi.WifiConfiguration;
import android.os.Bundle;
import android.os.Parcelable;
@@ -139,6 +140,12 @@ public class AddAppNetworksFragmentTest {
                0).mWifiConfiguration.SSID).isEqualTo(FAKE_NEW_OPEN_SSID);
    }

    @Test
    public void getMetricsCategory_shouldReturnPanelAddWifiNetworks() {
        assertThat(mAddAppNetworksFragment.getMetricsCategory()).isEqualTo(
                SettingsEnums.PANEL_ADD_WIFI_NETWORKS);
    }

    private void addOneSavedNetworkConfig(@NonNull WifiConfiguration wifiConfiguration) {
        if (mFakeSavedNetworksList == null) {
            mFakeSavedNetworksList = new ArrayList<>();
@@ -180,5 +187,4 @@ public class AddAppNetworksFragmentTest {
        }
        return config;
    }

}