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

Merge "Fix enhanced estimate discharge text showing while charging" into oc-dr1-dev am: 4d3b534325

Browse Source 
am: 1cd965b519

Change-Id: Ie86a201b9fabcda0d10cdc0c738f51e28fda5a1b
This commit is contained in:
Salvador Martinez
2017-07-14 22:04:53 +00:00
committed by android-build-merger
parent d75a692793 1cd965b519
commit e15cee7ecf
7 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
View File

@@ -15,7 +15,10 @@ package com.android.settings.fuelgauge;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.os.BatteryManager;
import android.os.BatteryStats;
import android.os.Bundle;
import android.os.Handler;
@@ -171,7 +174,11 @@ public class PowerUsageAdvanced extends PowerUsageBase {
updatePreference(mHistPref);
refreshPowerUsageDataList(mStatsHelper, mUsageListGroup);
if (mPowerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(context)) {
Intent batteryIntent =
context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
final boolean plugged = batteryIntent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) != 0;
if (mPowerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(context) && !plugged) {
mHistPref.setBottomSummary(
mPowerUsageFeatureProvider.getAdvancedUsageScreenInfoString());
} else {