From 693711469df15506b1467d71b84686f3acb6bae2 Mon Sep 17 00:00:00 2001 From: Zaiyue Xue Date: Fri, 15 Jul 2022 15:54:47 +0800 Subject: [PATCH] Updates battery usage messages from last 24hr to last full charge. (Part2: non-V2 files) Test: manual Bug: 236101166 Change-Id: Id5ad3e859a01d3288a950bf6288eafc6144a23d6 --- res/layout/battery_chart_graph.xml | 2 +- res/values/strings.xml | 2 + .../AppBatteryPreferenceController.java | 4 +- .../fuelgauge/AdvancedPowerUsageDetail.java | 15 +-- .../batteryusage/PowerUsageSummary.java | 5 +- .../AppBatteryPreferenceControllerTest.java | 6 +- .../AdvancedPowerUsageDetailTest.java | 106 +++++++++--------- ...atteryChartPreferenceControllerV2Test.java | 2 +- .../batteryusage/PowerUsageSummaryTest.java | 12 +- 9 files changed, 71 insertions(+), 83 deletions(-) diff --git a/res/layout/battery_chart_graph.xml b/res/layout/battery_chart_graph.xml index df481443e83..024f37cbf70 100644 --- a/res/layout/battery_chart_graph.xml +++ b/res/layout/battery_chart_graph.xml @@ -29,7 +29,7 @@ android:layout_marginVertical="16dp" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="?android:attr/textColorSecondary" - android:text="@string/battery_usage_chart_graph_hint" /> + android:text="@string/battery_usage_chart_graph_hint_last_full_charge" /> Show battery percentage in status bar + + Battery level since last full charge Battery level for past 24 hr diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java index 99c630d9c3e..087d4f919b6 100644 --- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java @@ -200,10 +200,10 @@ public class AppBatteryPreferenceController extends BasePreferenceController mBatteryPercent = Utils.formatPercentage( mBatteryDiffEntry.getPercentOfTotal(), /* round */ true); mPreference.setSummary(mContext.getString( - R.string.battery_summary_24hr, mBatteryPercent)); + R.string.battery_summary, mBatteryPercent)); } else { mPreference.setSummary( - mContext.getString(R.string.no_battery_summary_24hr)); + mContext.getString(R.string.no_battery_summary)); } } diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index c813a57b09c..9cebd1e1b9c 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -482,16 +482,13 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements return null; } if (totalTimeMs == 0) { - final int batteryWithoutUsageTime = consumedPower > 0 - ? R.string.battery_usage_without_time : R.string.battery_not_usage_24hr; - usageTimeSummary = getText(isChartGraphEnabled - ? batteryWithoutUsageTime : R.string.battery_not_usage); + usageTimeSummary = getText( + isChartGraphEnabled && consumedPower > 0 ? R.string.battery_usage_without_time + : R.string.battery_not_usage); } else if (slotTime == null) { - // Shows summary text with past 24 hr or full charge if slot time is null. - usageTimeSummary = isChartGraphEnabled - ? getAppPast24HrActiveSummary(foregroundTimeMs, backgroundTimeMs, totalTimeMs) - : getAppFullChargeActiveSummary( - foregroundTimeMs, backgroundTimeMs, totalTimeMs); + // Shows summary text with last full charge if slot time is null. + usageTimeSummary = getAppFullChargeActiveSummary( + foregroundTimeMs, backgroundTimeMs, totalTimeMs); } else { // Shows summary text with slot time. usageTimeSummary = getAppActiveSummaryWithSlotTime( diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java index 405d855d3d8..bca32a78f8f 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java @@ -259,10 +259,7 @@ public class PowerUsageSummary extends PowerUsageBase implements @VisibleForTesting void initPreference() { mBatteryUsagePreference = findPreference(KEY_BATTERY_USAGE); - mBatteryUsagePreference.setSummary( - mPowerFeatureProvider.isChartGraphEnabled(getContext()) - ? getString(R.string.advanced_battery_preference_summary_with_hours) - : getString(R.string.advanced_battery_preference_summary)); + mBatteryUsagePreference.setSummary(getString(R.string.advanced_battery_preference_summary)); mHelpPreference = findPreference(KEY_BATTERY_ERROR); mHelpPreference.setVisible(false); diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java index a75663b2f64..c95a50955d8 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java @@ -162,7 +162,8 @@ public class AppBatteryPreferenceControllerTest { mController.updateBatteryWithDiffEntry(); - assertThat(mBatteryPreference.getSummary()).isEqualTo("No battery use for past 24 hours"); + assertThat(mBatteryPreference.getSummary().toString()).isEqualTo( + "No battery use since last full charge"); } @Test @@ -175,7 +176,8 @@ public class AppBatteryPreferenceControllerTest { mController.updateBatteryWithDiffEntry(); - assertThat(mBatteryPreference.getSummary()).isEqualTo("60% use for past 24 hours"); + assertThat(mBatteryPreference.getSummary().toString()).isEqualTo( + "60% use since last full charge"); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index e7d7cd0c3b9..f408c4b07f9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -224,12 +224,12 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testGetPreferenceScreenResId_returnNewLayout() { + public void setPreferenceScreenResId_returnNewLayout() { assertThat(mFragment.getPreferenceScreenResId()).isEqualTo(R.xml.power_usage_detail); } @Test - public void testInitHeader_NoAppEntry_BuildByBundle() { + public void initHeader_NoAppEntry_BuildByBundle() { mFragment.mAppEntry = null; mFragment.initHeader(); @@ -238,7 +238,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_HasAppEntry_BuildByAppEntry() { + public void initHeader_HasAppEntry_BuildByAppEntry() { ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider", new InstantAppDataProvider() { @Override @@ -255,7 +255,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_HasAppEntry_InstantApp() { + public void initHeader_HasAppEntry_InstantApp() { ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider", new InstantAppDataProvider() { @Override @@ -272,7 +272,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_noUsageTimeAndGraphDisabled_hasCorrectSummary() { + public void initHeader_noUsageTimeAndGraphDisabled_hasCorrectSummary() { when(mFeatureFactory.powerUsageFeatureProvider.isChartGraphEnabled(mContext)) .thenReturn(false); @@ -290,7 +290,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_bgTwoMinFgZeroAndGraphDisabled_hasCorrectSummary() { + public void initHeader_bgTwoMinFgZeroAndGraphDisabled_hasCorrectSummary() { when(mFeatureFactory.powerUsageFeatureProvider.isChartGraphEnabled(mContext)) .thenReturn(false); @@ -310,7 +310,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_bgLessThanAMinFgZeroAndGraphDisabled_hasCorrectSummary() { + public void initHeader_bgLessThanAMinFgZeroAndGraphDisabled_hasCorrectSummary() { when(mFeatureFactory.powerUsageFeatureProvider.isChartGraphEnabled(mContext)) .thenReturn(false); @@ -331,7 +331,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_totalUsageLessThanAMinAndGraphDisabled_hasCorrectSummary() { + public void initHeader_totalUsageLessThanAMinAndGraphDisabled_hasCorrectSummary() { when(mFeatureFactory.powerUsageFeatureProvider.isChartGraphEnabled(mContext)) .thenReturn(false); @@ -353,7 +353,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_TotalAMinutesBgLessThanAMinAndGraphDisabled_hasCorrectSummary() { + public void initHeader_TotalAMinutesBgLessThanAMinAndGraphDisabled_hasCorrectSummary() { when(mFeatureFactory.powerUsageFeatureProvider.isChartGraphEnabled(mContext)) .thenReturn(false); @@ -373,7 +373,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_TotalAMinBackgroundZeroAndGraphDisabled_hasCorrectSummary() { + public void initHeader_TotalAMinBackgroundZeroAndGraphDisabled_hasCorrectSummary() { when(mFeatureFactory.powerUsageFeatureProvider.isChartGraphEnabled(mContext)) .thenReturn(false); final long backgroundTimeZero = 0; @@ -392,7 +392,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_fgTwoMinBgFourMinAndGraphDisabled_hasCorrectSummary() { + public void initHeader_fgTwoMinBgFourMinAndGraphDisabled_hasCorrectSummary() { when(mFeatureFactory.powerUsageFeatureProvider.isChartGraphEnabled(mContext)) .thenReturn(false); final long backgroundTimeFourMinute = 240000; @@ -410,7 +410,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_noUsageTime_hasCorrectSummary() { + public void initHeader_noUsageTime_hasCorrectSummary() { Bundle bundle = new Bundle(2); bundle.putLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME, /* value */ 0); bundle.putLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME, /* value */ 0); @@ -421,11 +421,11 @@ public class AdvancedPowerUsageDetailTest { ArgumentCaptor captor = ArgumentCaptor.forClass(CharSequence.class); verify(mEntityHeaderController).setSummary(captor.capture()); assertThat(captor.getValue().toString()) - .isEqualTo("No usage for past 24 hr"); + .isEqualTo("No usage from last full charge"); } @Test - public void testInitHeader_noUsageTimeButConsumedPower_hasEmptySummary() { + public void initHeader_noUsageTimeButConsumedPower_hasEmptySummary() { Bundle bundle = new Bundle(3); bundle.putLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME, /* value */ 0); bundle.putLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME, /* value */ 0); @@ -440,7 +440,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_backgroundTwoMinForegroundZero_hasCorrectSummary() { + public void initHeader_backgroundTwoMinForegroundZero_hasCorrectSummary() { final long backgroundTimeTwoMinutes = 120000; final long foregroundTimeZero = 0; Bundle bundle = new Bundle(2); @@ -453,11 +453,11 @@ public class AdvancedPowerUsageDetailTest { ArgumentCaptor captor = ArgumentCaptor.forClass(CharSequence.class); verify(mEntityHeaderController).setSummary(captor.capture()); assertThat(captor.getValue().toString()) - .isEqualTo("2 min background for past 24 hr"); + .isEqualTo("2 min background from last full charge"); } @Test - public void testInitHeader_backgroundLessThanAMinForegroundZero_hasCorrectSummary() { + public void initHeader_backgroundLessThanAMinForegroundZero_hasCorrectSummary() { final long backgroundTimeLessThanAMinute = 59999; final long foregroundTimeZero = 0; Bundle bundle = new Bundle(2); @@ -471,11 +471,11 @@ public class AdvancedPowerUsageDetailTest { ArgumentCaptor captor = ArgumentCaptor.forClass(CharSequence.class); verify(mEntityHeaderController).setSummary(captor.capture()); assertThat(captor.getValue().toString()) - .isEqualTo("Background less than a minute for past 24 hr"); + .isEqualTo("Background less than a minute from last full charge"); } @Test - public void testInitHeader_totalUsageLessThanAMin_hasCorrectSummary() { + public void initHeader_totalUsageLessThanAMin_hasCorrectSummary() { final long backgroundTimeLessThanHalfMinute = 20000; final long foregroundTimeLessThanHalfMinute = 20000; Bundle bundle = new Bundle(2); @@ -490,11 +490,11 @@ public class AdvancedPowerUsageDetailTest { ArgumentCaptor captor = ArgumentCaptor.forClass(CharSequence.class); verify(mEntityHeaderController).setSummary(captor.capture()); assertThat(captor.getValue().toString()) - .isEqualTo("Total less than a minute for past 24 hr"); + .isEqualTo("Total less than a minute from last full charge"); } @Test - public void testInitHeader_TotalAMinutesBackgroundLessThanAMin_hasCorrectSummary() { + public void initHeader_TotalAMinutesBackgroundLessThanAMin_hasCorrectSummary() { final long backgroundTimeZero = 59999; final long foregroundTimeTwoMinutes = 1; Bundle bundle = new Bundle(2); @@ -507,11 +507,11 @@ public class AdvancedPowerUsageDetailTest { ArgumentCaptor captor = ArgumentCaptor.forClass(CharSequence.class); verify(mEntityHeaderController).setSummary(captor.capture()); assertThat(captor.getValue().toString()) - .isEqualTo("1 min total • background less than a minute\nfor past 24 hr"); + .isEqualTo("1 min total • background less than a minute\nfrom last full charge"); } @Test - public void testInitHeader_TotalAMinBackgroundZero_hasCorrectSummary() { + public void initHeader_TotalAMinBackgroundZero_hasCorrectSummary() { final long backgroundTimeZero = 0; final long foregroundTimeAMinutes = 60000; Bundle bundle = new Bundle(2); @@ -524,11 +524,11 @@ public class AdvancedPowerUsageDetailTest { ArgumentCaptor captor = ArgumentCaptor.forClass(CharSequence.class); verify(mEntityHeaderController).setSummary(captor.capture()); assertThat(captor.getValue().toString()) - .isEqualTo("1 min total for past 24 hr"); + .isEqualTo("1 min total from last full charge"); } @Test - public void testInitHeader_foregroundTwoMinBackgroundFourMin_hasCorrectSummary() { + public void initHeader_foregroundTwoMinBackgroundFourMin_hasCorrectSummary() { final long backgroundTimeFourMinute = 240000; final long foregroundTimeTwoMinutes = 120000; Bundle bundle = new Bundle(2); @@ -541,11 +541,11 @@ public class AdvancedPowerUsageDetailTest { ArgumentCaptor captor = ArgumentCaptor.forClass(CharSequence.class); verify(mEntityHeaderController).setSummary(captor.capture()); assertThat(captor.getValue().toString()) - .isEqualTo("6 min total • 4 min background\nfor past 24 hr"); + .isEqualTo("6 min total • 4 min background\nfrom last full charge"); } @Test - public void testInitHeader_totalUsageLessThanAMinWithSlotTime_hasCorrectSummary() { + public void initHeader_totalUsageLessThanAMinWithSlotTime_hasCorrectSummary() { final long backgroundTimeLessThanHalfMinute = 20000; final long foregroundTimeLessThanHalfMinute = 20000; Bundle bundle = new Bundle(3); @@ -565,7 +565,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_TotalAMinBackgroundLessThanAMinWithSlotTime_hasCorrectSummary() { + public void initHeader_TotalAMinBackgroundLessThanAMinWithSlotTime_hasCorrectSummary() { final long backgroundTimeZero = 59999; final long foregroundTimeTwoMinutes = 1; Bundle bundle = new Bundle(3); @@ -583,7 +583,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_TotalAMinBackgroundZeroWithSlotTime_hasCorrectSummary() { + public void initHeader_TotalAMinBackgroundZeroWithSlotTime_hasCorrectSummary() { final long backgroundTimeZero = 0; final long foregroundTimeAMinutes = 60000; Bundle bundle = new Bundle(3); @@ -601,7 +601,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_foregroundTwoMinBackgroundFourMinWithSlotTime_hasCorrectSummary() { + public void initHeader_foregroundTwoMinBackgroundFourMinWithSlotTime_hasCorrectSummary() { final long backgroundTimeFourMinute = 240000; final long foregroundTimeTwoMinutes = 120000; Bundle bundle = new Bundle(3); @@ -619,7 +619,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_systemUidWithChartIsDisabled_nullSummary() { + public void initHeader_systemUidWithChartIsDisabled_nullSummary() { Bundle bundle = new Bundle(3); bundle.putLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME, 240000); bundle.putLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME, 120000); @@ -636,7 +636,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitHeader_systemUidWithChartIsEnabled_notNullSummary() { + public void initHeader_systemUidWithChartIsEnabled_notNullSummary() { Bundle bundle = new Bundle(3); bundle.putLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME, 240000); bundle.putLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME, 120000); @@ -651,21 +651,21 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testStartBatteryDetailPage_hasBasicData() { + public void startBatteryDetailPage_hasBasicData() { AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, mBatteryEntry, USAGE_PERCENT, /*isValidToShowSummary=*/ true); assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID); assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME)) - .isEqualTo(BACKGROUND_TIME_MS); + .isEqualTo(BACKGROUND_TIME_MS); assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME)) - .isEqualTo(FOREGROUND_TIME_MS); + .isEqualTo(FOREGROUND_TIME_MS); assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)) - .isEqualTo(USAGE_PERCENT); + .isEqualTo(USAGE_PERCENT); } @Test - public void testStartBatteryDetailPage_invalidToShowSummary_noFGBDData() { + public void startBatteryDetailPage_invalidToShowSummary_noFGBDData() { AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, mBatteryEntry, USAGE_PERCENT, /*isValidToShowSummary=*/ false); @@ -679,7 +679,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testStartBatteryDetailPage_NormalApp() { + public void startBatteryDetailPage_NormalApp() { when(mBatteryEntry.getDefaultPackageName()).thenReturn(PACKAGE_NAME[0]); AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, @@ -690,7 +690,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testStartBatteryDetailPage_SystemApp() { + public void startBatteryDetailPage_SystemApp() { when(mBatteryEntry.getDefaultPackageName()).thenReturn(null); AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, @@ -702,7 +702,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testStartBatteryDetailPage_WorkApp() { + public void startBatteryDetailPage_WorkApp() { final int appUid = 1010019; doReturn(appUid).when(mBatteryEntry).getUid(); @@ -713,7 +713,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testStartBatteryDetailPage_typeUser_startByCurrentUser() { + public void startBatteryDetailPage_typeUser_startByCurrentUser() { when(mBatteryEntry.isUserEntry()).thenReturn(true); final int currentUser = 20; @@ -725,7 +725,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testStartBatteryDetailPage_noBatteryUsage_hasBasicData() { + public void startBatteryDetailPage_noBatteryUsage_hasBasicData() { final ArgumentCaptor captor = ArgumentCaptor.forClass(Intent.class); AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, PACKAGE_NAME[0]); @@ -733,16 +733,16 @@ public class AdvancedPowerUsageDetailTest { verify(mActivity).startActivity(captor.capture()); assertThat(captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS) - .getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)) - .isEqualTo(PACKAGE_NAME[0]); + .getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)) + .isEqualTo(PACKAGE_NAME[0]); assertThat(captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS) - .getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)) - .isEqualTo("0%"); + .getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)) + .isEqualTo("0%"); } @Test - public void testStartBatteryDetailPage_batteryEntryNotExisted_extractUidFromPackageName() throws + public void startBatteryDetailPage_batteryEntryNotExisted_extractUidFromPackageName() throws PackageManager.NameNotFoundException { doReturn(UID).when(mPackageManager).getPackageUid(PACKAGE_NAME[0], 0 /* no flag */); @@ -752,7 +752,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitPreferenceForTriState_isValidPackageName_hasCorrectString() { + public void initPreferenceForTriState_isValidPackageName_hasCorrectString() { when(mBatteryOptimizeUtils.isValidPackageName()).thenReturn(false); mFragment.initPreferenceForTriState(mContext); @@ -762,7 +762,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitPreferenceForTriState_isSystemOrDefaultApp_hasCorrectString() { + public void initPreferenceForTriState_isSystemOrDefaultApp_hasCorrectString() { when(mBatteryOptimizeUtils.isValidPackageName()).thenReturn(true); when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true); @@ -773,7 +773,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testInitPreferenceForTriState_hasCorrectString() { + public void initPreferenceForTriState_hasCorrectString() { when(mBatteryOptimizeUtils.isValidPackageName()).thenReturn(true); when(mBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(false); @@ -784,7 +784,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testOnRadioButtonClicked_clickOptimizePref_optimizePreferenceChecked() { + public void onRadioButtonClicked_clickOptimizePref_optimizePreferenceChecked() { mOptimizePreference.setKey(KEY_PREF_OPTIMIZED); mRestrictedPreference.setKey(KEY_PREF_RESTRICTED); mUnrestrictedPreference.setKey(KEY_PREF_UNRESTRICTED); @@ -796,7 +796,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testOnPause_optimizationModeChanged_logPreference() { + public void onPause_optimizationModeChanged_logPreference() { final int mode = BatteryOptimizeUtils.MODE_RESTRICTED; mFragment.mOptimizationMode = mode; when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(mode); @@ -815,7 +815,7 @@ public class AdvancedPowerUsageDetailTest { } @Test - public void testOnPause_optimizationModeIsNotChanged_notInvokeLogging() { + public void onPause_optimizationModeIsNotChanged_notInvokeLogging() { final int mode = BatteryOptimizeUtils.MODE_OPTIMIZED; mFragment.mOptimizationMode = mode; when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(mode); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2Test.java index 989790e59cd..77adcb2b643 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2Test.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2Test.java @@ -516,7 +516,7 @@ public final class BatteryChartPreferenceControllerV2Test { } @Test - public void refreshCategoryTitle_setLast24HrIntoBothTitleTextView() { + public void refreshCategoryTitle_setLastFullChargeIntoBothTitleTextView() { mBatteryChartPreferenceController = createController(); mBatteryChartPreferenceController.mAppListPrefGroup = spy(new PreferenceCategory(mContext)); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java index 81b574aa7d6..c0494972f35 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java @@ -139,17 +139,7 @@ public class PowerUsageSummaryTest { } @Test - public void initPreference_chartGraphEnabled_hasCorrectSummary() { - mFragment.initPreference(); - - verify(mBatteryUsagePreference).setSummary("View usage for past 24 hours"); - } - - @Test - public void initPreference_chartGraphDisabled_hasCorrectSummary() { - when(mFeatureFactory.powerUsageFeatureProvider.isChartGraphEnabled(mRealContext)) - .thenReturn(false); - + public void initPreference_hasCorrectSummary() { mFragment.initPreference(); verify(mBatteryUsagePreference).setSummary("View usage from last full charge");