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

Merge "Don't update the header when toggle menu" into oc-dr1-dev

Browse Source 
am: 4ab4966e7a

Change-Id: I323a94bc867d7575bd7ec7e34c506dd8e78ec2d1
This commit is contained in:
jackqdyulei
2017-07-27 18:21:16 +00:00
committed by android-build-merger
parent e993ab19fc 4ab4966e7a
commit 16afa828c7
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -136,7 +136,8 @@ public class PowerUsageSummary extends PowerUsageBase implements
SparseArray<List<Anomaly>> mAnomalySparseArray;
@VisibleForTesting
PreferenceGroup mAppListGroup;
private BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
@VisibleForTesting
BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
private AnomalySummaryPreferenceController mAnomalySummaryPreferenceController;
private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
@@ -381,7 +382,7 @@ public class PowerUsageSummary extends PowerUsageBase implements
item.setTitle(mShowAllApps ? R.string.hide_extra_apps : R.string.show_all_apps);
metricsFeatureProvider.action(context,
MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE, mShowAllApps);
restartBatteryStatsLoader();
restartBatteryStatsLoader(false /* clearHeader */);
return true;
default:
return super.onOptionsItemSelected(item);
@@ -861,8 +862,14 @@ public class PowerUsageSummary extends PowerUsageBase implements
@Override
protected void restartBatteryStatsLoader() {
restartBatteryStatsLoader(true /* clearHeader */);
}
void restartBatteryStatsLoader(boolean clearHeader) {
super.restartBatteryStatsLoader();
mBatteryHeaderPreferenceController.quickUpdateHeaderPreference();
if (clearHeader) {
mBatteryHeaderPreferenceController.quickUpdateHeaderPreference();
}
}
private static class SummaryProvider implements SummaryLoader.SummaryProvider {

11
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
View File

@@ -157,6 +157,8 @@ public class PowerUsageSummaryTest {
private PreferenceGroup mAppListGroup;
@Mock
private AnomalyDetectionPolicy mAnomalyDetectionPolicy;
@Mock
private BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
private List<BatterySipper> mUsageList;
private Context mRealContext;
@@ -566,6 +568,15 @@ public class PowerUsageSummaryTest {
verify(mSummary1, times(2)).setOnLongClickListener(any(View.OnLongClickListener.class));
}
@Test
public void testRestartBatteryStatsLoader_notClearHeader_quickUpdateNotInvoked() {
mFragment.mBatteryHeaderPreferenceController = mBatteryHeaderPreferenceController;
mFragment.restartBatteryStatsLoader(false /* clearHeader */);
verify(mBatteryHeaderPreferenceController, never()).quickUpdateHeaderPreference();
}
public static class TestFragment extends PowerUsageSummary {
private Context mContext;