Revert "Change battery tip text"

This reverts commit 2441b94c6d.

Reason for revert: <wrong commit>

Change-Id: I373fc065eafc81c26a8eba133255f9377d1d5d7f
This commit is contained in:
Raff Tsai
2019-03-08 08:51:05 +00:00
parent 2441b94c6d
commit 39beb2533f
3 changed files with 1 additions and 23 deletions

View File

@@ -47,7 +47,6 @@ public class BatteryInfo {
public long averageTimeToDischarge = Estimate.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN;
public String batteryPercentString;
public String statusLabel;
public String suggestionLabel;
private boolean mCharging;
private BatteryStats mStats;
private static final String LOG_TAG = "BatteryInfo";
@@ -248,7 +247,6 @@ public class BatteryInfo {
final int status = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,
BatteryManager.BATTERY_STATUS_UNKNOWN);
info.discharging = false;
info.suggestionLabel = null;
if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {
info.remainingTimeUs = chargeTime;
CharSequence timeString = StringUtil.formatElapsedTime(context,
@@ -284,11 +282,8 @@ public class BatteryInfo {
info.batteryPercentString,
estimate.isBasedOnUsage && !shortString
);
info.suggestionLabel = PowerUtil.getBatterySuggestionStringFormatted(
context, PowerUtil.convertUsToMs(drainTimeUs));
} else {
info.remainingLabel = null;
info.suggestionLabel = null;
info.chargeLabel = info.batteryPercentString;
}
}