Merge "Remove battery usage preference in app info page" into pi-dev

This commit is contained in:
TreeHugger Robot
2018-04-16 17:14:49 +00:00
committed by Android (Google) Code Review
4 changed files with 0 additions and 20 deletions

View File

@@ -136,7 +136,6 @@ public class AdvancedPowerUsageDetailTest {
private Context mContext;
private Preference mForegroundPreference;
private Preference mBackgroundPreference;
private Preference mPowerUsagePreference;
private AdvancedPowerUsageDetail mFragment;
private SettingsActivity mTestActivity;
private List<Anomaly> mAnomalies;
@@ -214,10 +213,8 @@ public class AdvancedPowerUsageDetailTest {
mForegroundPreference = new Preference(mContext);
mBackgroundPreference = new Preference(mContext);
mPowerUsagePreference = new Preference(mContext);
mFragment.mForegroundPreference = mForegroundPreference;
mFragment.mBackgroundPreference = mBackgroundPreference;
mFragment.mPowerUsagePreference = mPowerUsagePreference;
mFragment.mAnomalySummaryPreferenceController = mAnomalySummaryPreferenceController;
mAnomalies = new ArrayList<>();
@@ -412,15 +409,11 @@ public class AdvancedPowerUsageDetailTest {
R.string.battery_used_for);
doReturn(mContext.getText(R.string.battery_active_for)).when(mFragment).getText(
R.string.battery_active_for);
doReturn(mContext.getString(R.string.battery_detail_power_percentage, USAGE_PERCENT,
POWER_MAH)).when(mFragment)
.getString(R.string.battery_detail_power_percentage, USAGE_PERCENT, POWER_MAH);
mFragment.initPreference();
assertThat(mForegroundPreference.getSummary().toString()).isEqualTo("Used for 0 min");
assertThat(mBackgroundPreference.getSummary().toString()).isEqualTo("Active for 0 min");
assertThat(mPowerUsagePreference.getSummary()).isEqualTo("16% of total app usage (150mAh)");
}
@Test