diff --git a/res/values/strings.xml b/res/values/strings.xml index 44e7e98762a..062648a36c4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5321,8 +5321,6 @@ While in background Battery usage - - %1$s of total app usage (%2$dmAh) Since full charge diff --git a/res/xml/power_usage_detail.xml b/res/xml/power_usage_detail.xml index acc62b6cb8d..2be2a527ac1 100644 --- a/res/xml/power_usage_detail.xml +++ b/res/xml/power_usage_detail.xml @@ -61,11 +61,6 @@ android:title="@string/battery_detail_background" android:selectable="false"/> - - \ No newline at end of file diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 0c82faa0e66..683395e773c 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -87,7 +87,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements private static final String KEY_PREF_FOREGROUND = "app_usage_foreground"; private static final String KEY_PREF_BACKGROUND = "app_usage_background"; - private static final String KEY_PREF_POWER_USAGE = "app_power_usage"; private static final String KEY_PREF_HEADER = "header_view"; private static final int REQUEST_UNINSTALL = 0; @@ -109,8 +108,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements @VisibleForTesting Preference mBackgroundPreference; @VisibleForTesting - Preference mPowerUsagePreference; - @VisibleForTesting AnomalySummaryPreferenceController mAnomalySummaryPreferenceController; private AppButtonsPreferenceController mAppButtonsPreferenceController; private BackgroundActivityPreferenceController mBackgroundActivityPreferenceController; @@ -221,7 +218,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements (SettingsActivity) getActivity(), this); mForegroundPreference = findPreference(KEY_PREF_FOREGROUND); mBackgroundPreference = findPreference(KEY_PREF_BACKGROUND); - mPowerUsagePreference = findPreference(KEY_PREF_POWER_USAGE); mHeaderPreference = (LayoutPreference) findPreference(KEY_PREF_HEADER); if (mPackageName != null) { @@ -297,8 +293,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements mBackgroundPreference.setSummary( TextUtils.expandTemplate(getText(R.string.battery_active_for), StringUtil.formatElapsedTime(context, backgroundTimeMs, false))); - mPowerUsagePreference.setSummary( - getString(R.string.battery_detail_power_percentage, usagePercent, powerMah)); } @Override diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index b7bcb9501fb..0be63899785 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -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 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