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

[Settings] Code refactor

Browse Source 
1. Fix comments
2. Split test case

Bug: 147338143
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageListTest
Change-Id: I017a3ac8a716e69eb4d9c3e30e20363a215563a2
This commit is contained in:
Bonian Chen
2020-01-08 17:29:36 +08:00
parent 65a0488e1b
commit 90cb45e31c
6 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/datausage/BillingCyclePreference.java
View File

@@ -96,7 +96,7 @@ public class BillingCyclePreference extends Preference
}
/**
* Implementation of MobileDataEnabledListener.Client
* Implementation of {@code MobileDataEnabledListener.Client}
*/
public void onMobileDataEnabledChange() {
updateEnabled();

2
src/com/android/settings/datausage/CellDataPreference.java
View File

@@ -240,7 +240,7 @@ public class CellDataPreference extends CustomDialogPreferenceCompat
};
/**
* Implementation of MobileDataEnabledListener.Client
* Implementation of {@code MobileDataEnabledListener.Client}
*/
@VisibleForTesting
public void onMobileDataEnabledChange() {

3
src/com/android/settings/datausage/DataUsageList.java
View File

@@ -201,7 +201,6 @@ public class DataUsageList extends DataUsageBaseFragment
public void onDestroy() {
mUidDetailProvider.clearCache();
mUidDetailProvider = null;
mDataStateListener.stop();
super.onDestroy();
}
@@ -232,7 +231,7 @@ public class DataUsageList extends DataUsageBaseFragment
}
/**
* Implementation of MobileDataEnabledListener.Client
* Implementation of {@code MobileDataEnabledListener.Client}
*/
public void onMobileDataEnabledChange() {
updatePolicy();

2
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -78,7 +78,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
super.onCreate(icicle);
Context context = getContext();
// enable ProxySubscriptionMgr with Lifecycle support for all controllers
// Enable ProxySubscriptionMgr with Lifecycle support for all controllers
// live within this fragment
mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(context);
mProxySubscriptionMgr.setLifecycle(getLifecycle());

12
src/com/android/settings/network/MobileDataEnabledListener.java
View File

@@ -25,12 +25,12 @@ public class MobileDataEnabledListener {
private Context mContext;
private Client mClient;
private int mSubId;
/**
* There're 2 listeners both activated at the same time.
* For project that access MOBILE_DATA, only first listener is functional.
* For project that access "MOBILE_DATA + subId", first listener will be stopped when receiving
* any onChange from second listener.
*/
// There're 2 listeners both activated at the same time.
// For project that access MOBILE_DATA, only first listener is functional.
// For project that access "MOBILE_DATA + subId", first listener will be stopped when receiving
// any onChange from second listener.
private GlobalSettingsChangeListener mListener;
private GlobalSettingsChangeListener mListenerForSubId;

13
tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
View File

@@ -93,7 +93,7 @@ public class DataUsageListTest {
}
@Test
public void resumePause_shouldListenUnlistenDataStateChange() {
public void resume_shouldListenDataStateChange() {
ReflectionHelpers.setField(
mDataUsageList, "mVisibilityLoggerMixin", mock(VisibilityLoggerMixin.class));
ReflectionHelpers.setField(
@@ -104,6 +104,17 @@ public class DataUsageListTest {
verify(mMobileDataEnabledListener).start(anyInt());
mDataUsageList.onPause();
}
@Test
public void pause_shouldUnlistenDataStateChange() {
ReflectionHelpers.setField(
mDataUsageList, "mVisibilityLoggerMixin", mock(VisibilityLoggerMixin.class));
ReflectionHelpers.setField(
mDataUsageList, "mPreferenceManager", mock(PreferenceManager.class));
mDataUsageList.onResume();
mDataUsageList.onPause();
verify(mMobileDataEnabledListener).stop();
}