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

am: e5b270a4dd

Change-Id: I394652b3b170625fc51f54d675c9a07d951a72a3
This commit is contained in:
Lei Yu
2018-04-16 10:59:36 -07:00
committed by android-build-merger
4 changed files with 0 additions and 20 deletions

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_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