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

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

Browse Source
This commit is contained in:
Goven Liu
2019-12-18 07:22:14 +00:00
committed by Android (Google) Code Review
parent faa90620b2 cfd8a5d253
commit b945785ddb
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
View File

@@ -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) {

8
tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
View File

@@ -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;
}
}