PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue #15597136: n7 not showing estimated discharge time

Browse Source 
Use battery plugged state to decide whether to show the estimated
discharge time remaining vs. charge time remaining.

Change-Id: I2e0d12871201e7d4927aaa9a94d15bff949a881c
This commit is contained in:
Dianne Hackborn
2014-06-12 16:40:56 -07:00
parent f9360dbcef
commit b11c973799
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/fuelgauge/BatteryHistoryChart.java
View File

@@ -489,11 +489,9 @@ public class BatteryHistoryChart extends View {
R.string.percentage, 0); R.string.percentage, 0);
int batteryLevel = com.android.settings.Utils.getBatteryLevel(mBatteryBroadcast); int batteryLevel = com.android.settings.Utils.getBatteryLevel(mBatteryBroadcast);
final int status = mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,
BatteryManager.BATTERY_STATUS_UNKNOWN);
long remainingTimeUs = 0; long remainingTimeUs = 0;
mDischarging = true; mDischarging = true;
if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) { if (mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) == 0) {
final long drainTime = mStats.computeBatteryTimeRemaining(elapsedRealtimeUs); final long drainTime = mStats.computeBatteryTimeRemaining(elapsedRealtimeUs);
if (drainTime > 0) { if (drainTime > 0) {
remainingTimeUs = drainTime; remainingTimeUs = drainTime;
@@ -509,6 +507,8 @@ public class BatteryHistoryChart extends View {
final long chargeTime = mStats.computeChargeTimeRemaining(elapsedRealtimeUs); final long chargeTime = mStats.computeChargeTimeRemaining(elapsedRealtimeUs);
final String statusLabel = com.android.settings.Utils.getBatteryStatus(getResources(), final String statusLabel = com.android.settings.Utils.getBatteryStatus(getResources(),
mBatteryBroadcast); mBatteryBroadcast);
final int status = mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,
BatteryManager.BATTERY_STATUS_UNKNOWN);
if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) { if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {
mDischarging = false; mDischarging = false;
remainingTimeUs = chargeTime; remainingTimeUs = chargeTime;