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

Fix DataUsageSummary non-indexable keys

Browse Source 
Indexing in DataUsage was not conventional, since it
blocked adding XML based on current sim status rather than
indexing everything and changing non-indexabe keys.

Manual merge for: ag/2631595

Change-Id: I7bb3cdb0f11772bbaefb6c21c61eb63bd0b17c7e
Fixes: 64193449
Test: robotests
This commit is contained in:
Matthew Fritze
2017-07-31 09:44:57 -07:00
parent 56538f1775
commit 621c24861c
6 changed files with 114 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
View File

@@ -82,29 +82,4 @@ public class DataUsageSummaryTest {
verify(preference).setSummary(mContext.getResources().getQuantityString(
R.plurals.network_restrictions_summary, 0, 0));
}
@Test
public void testNonIndexableKeys_existInXmlLayout() {
final Context context = RuntimeEnvironment.application;
final List<String> niks = DataUsageSummary.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(context);
final List<String> keys = new ArrayList<>();
keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage_wifi));
keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage));
assertThat(keys).containsAllIn(niks);
}
@Test
@Config(shadows = ShadowConnectivityManager.class)
public void testNonIndexableKeys_hasMobileData_restrictedAccessesAdded() {
ShadowConnectivityManager.setIsNetworkSupported(true);
List<String> keys = DataUsageSummary.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(mContext);
assertThat(keys).contains(DataUsageSummary.KEY_RESTRICT_BACKGROUND);
assertThat(keys).contains(DataUsageSummary.KEY_NETWORK_RESTRICTIONS);
ShadowConnectivityManager.setIsNetworkSupported(false);
}
}