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

Merge "Fix robotests"

Browse Source
This commit is contained in:
Fan Zhang
2019-03-12 23:51:32 +00:00
committed by Android (Google) Code Review
parent 4b9a68385b 1ef08ae814
commit 774b8394a0
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/network_and_internet_v2.xml
View File

@@ -22,6 +22,7 @@
<PreferenceCategory
android:key="multi_network_header"
android:title="@string/summary_placeholder"
settings:allowDividerBelow="true"
android:order="-40"
settings:controller="com.android.settings.network.MultiNetworkHeaderController"/>
@@ -79,7 +80,7 @@
settings:useAdminDisabledSummary="true" />
<com.android.settings.datausage.DataSaverPreference
android:key="restrict_backgroundz"
android:key="restrict_background_parent_entry"
android:title="@string/data_saver_title"
android:icon="@drawable/ic_settings_data_usage"
android:order="10"

7
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -168,7 +168,12 @@ public class NetworkDashboardFragment extends DashboardFragment implements
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.network_and_internet;
if (FeatureFlagPersistent.isEnabled(context,
FeatureFlags.NETWORK_INTERNET_V2)) {
sir.xmlResId = R.xml.network_and_internet_v2;
} else {
sir.xmlResId = R.xml.network_and_internet;
}
return Arrays.asList(sir);
}

6
tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
View File

@@ -30,6 +30,8 @@ import android.os.Bundle;
import android.provider.Settings;
import android.telephony.TelephonyManager;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.core.FeatureFlags;
import com.android.settings.datausage.DataUsageSummaryPreferenceController;
import com.android.settings.development.featureflags.FeatureFlagPersistent;
@@ -48,8 +50,6 @@ import org.robolectric.annotation.Config;
import java.util.List;
import androidx.fragment.app.FragmentActivity;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowEntityHeaderController.class)
public class MobileNetworkSettingsTest {
@@ -86,6 +86,7 @@ public class MobileNetworkSettingsTest {
@Test
public void onAttach_noV2Flag_noCrash() {
FeatureFlagPersistent.setEnabled(mContext, FeatureFlags.NETWORK_INTERNET_V2, false);
mFragment.onAttach(mContext);
}
@@ -97,6 +98,7 @@ public class MobileNetworkSettingsTest {
@Test
public void createPreferenceControllers_noV2Flag_noDataUsageSummaryController() {
FeatureFlagPersistent.setEnabled(mContext, FeatureFlags.NETWORK_INTERNET_V2, false);
final List<AbstractPreferenceController> controllers =
mFragment.createPreferenceControllers(mContext);
assertThat(controllers.stream().filter(

4
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
View File

@@ -758,7 +758,9 @@ public class WifiDetailPreferenceControllerTest {
}
@Test
public void forgetNetwork_Passpoint() {
public void forgetNetwork_v1_Passpoint() {
FeatureFlagPersistent.setEnabled(mContext, FeatureFlags.NETWORK_INTERNET_V2, false);
mockWifiConfig.networkId = 5;
when(mockWifiConfig.isPasspoint()).thenReturn(true);

2
tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java
View File

@@ -82,6 +82,8 @@ public class SavedAccessPointsWifiSettingsTest {
@Test
public void onForget_isPasspointConfig_shouldRefreshAPList() {
FeatureFlagPersistent.setEnabled(RuntimeEnvironment.application,
FeatureFlags.NETWORK_INTERNET_V2, false);
when(mAccessPoint.isPasspointConfig()).thenReturn(true);
ReflectionHelpers.setField(mSettings, "mSelectedAccessPoint", mAccessPoint);