Remove battery usage preference in app info page

Bug: 78011526
Test: RunSettingsRoboTests
Change-Id: I2dfb989167fe27857590f416fbb16d401e53bc1d
This commit is contained in:
Lei Yu
2018-04-13 14:28:14 -07:00
parent 70bd0c6d00
commit 6e96055232
4 changed files with 0 additions and 20 deletions

View File

@@ -5315,8 +5315,6 @@
<string name="battery_detail_background">While in background</string> <string name="battery_detail_background">While in background</string>
<!-- Title for battery usage amount by this app. [CHAR LIMIT=80] --> <!-- Title for battery usage amount by this app. [CHAR LIMIT=80] -->
<string name="battery_detail_power_usage">Battery usage</string> <string name="battery_detail_power_usage">Battery usage</string>
<!-- Description for battery usage amount, i.e. 16% of overall app usage(340 mAh). [CHAR LIMIT=120] -->
<string name="battery_detail_power_percentage"><xliff:g id="percent">%1$s</xliff:g> of total app usage (<xliff:g id="power">%2$d</xliff:g>mAh)</string>
<!-- Title for the battery usage group, which means all the battery data are calculated 'since full charge' [CHAR LIMIT=40] --> <!-- Title for the battery usage group, which means all the battery data are calculated 'since full charge' [CHAR LIMIT=40] -->
<string name ="battery_detail_info_title">Since full charge</string> <string name ="battery_detail_info_title">Since full charge</string>
<!-- Title for the battery management group [CHAR LIMIT=40] --> <!-- Title for the battery management group [CHAR LIMIT=40] -->

View File

@@ -61,11 +61,6 @@
android:title="@string/battery_detail_background" android:title="@string/battery_detail_background"
android:selectable="false"/> android:selectable="false"/>
<Preference
android:key="app_power_usage"
android:title="@string/battery_detail_power_usage"
android:selectable="false"/>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

View File

@@ -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_FOREGROUND = "app_usage_foreground";
private static final String KEY_PREF_BACKGROUND = "app_usage_background"; 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 String KEY_PREF_HEADER = "header_view";
private static final int REQUEST_UNINSTALL = 0; private static final int REQUEST_UNINSTALL = 0;
@@ -109,8 +108,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
@VisibleForTesting @VisibleForTesting
Preference mBackgroundPreference; Preference mBackgroundPreference;
@VisibleForTesting @VisibleForTesting
Preference mPowerUsagePreference;
@VisibleForTesting
AnomalySummaryPreferenceController mAnomalySummaryPreferenceController; AnomalySummaryPreferenceController mAnomalySummaryPreferenceController;
private AppButtonsPreferenceController mAppButtonsPreferenceController; private AppButtonsPreferenceController mAppButtonsPreferenceController;
private BackgroundActivityPreferenceController mBackgroundActivityPreferenceController; private BackgroundActivityPreferenceController mBackgroundActivityPreferenceController;
@@ -221,7 +218,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
(SettingsActivity) getActivity(), this); (SettingsActivity) getActivity(), this);
mForegroundPreference = findPreference(KEY_PREF_FOREGROUND); mForegroundPreference = findPreference(KEY_PREF_FOREGROUND);
mBackgroundPreference = findPreference(KEY_PREF_BACKGROUND); mBackgroundPreference = findPreference(KEY_PREF_BACKGROUND);
mPowerUsagePreference = findPreference(KEY_PREF_POWER_USAGE);
mHeaderPreference = (LayoutPreference) findPreference(KEY_PREF_HEADER); mHeaderPreference = (LayoutPreference) findPreference(KEY_PREF_HEADER);
if (mPackageName != null) { if (mPackageName != null) {
@@ -297,8 +293,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
mBackgroundPreference.setSummary( mBackgroundPreference.setSummary(
TextUtils.expandTemplate(getText(R.string.battery_active_for), TextUtils.expandTemplate(getText(R.string.battery_active_for),
StringUtil.formatElapsedTime(context, backgroundTimeMs, false))); StringUtil.formatElapsedTime(context, backgroundTimeMs, false)));
mPowerUsagePreference.setSummary(
getString(R.string.battery_detail_power_percentage, usagePercent, powerMah));
} }
@Override @Override

View File

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