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

Add "unaccounted" item to battery use UI.

Browse Source 
Kind-of informative.

Change-Id: I10d2ee1ad8fe598a1ce1989df6628da11b82d906
This commit is contained in:
Dianne Hackborn
2014-01-13 17:40:50 -08:00
parent 5f37dda3d8
commit 5b6f59a072
4 changed files with 115 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -60,6 +60,8 @@ public class PowerUsageSummary extends PreferenceFragment {
private static final int MENU_HELP = Menu.FIRST + 2;
private PreferenceGroup mAppListGroup;
private String mBatteryLevel;
private String mBatteryStatus;
private Preference mBatteryStatusPref;
private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
@@ -74,13 +76,8 @@ public class PowerUsageSummary extends PreferenceFragment {
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
String batteryLevel = com.android.settings.Utils.getBatteryPercentage(intent);
String batteryStatus = com.android.settings.Utils.getBatteryStatus(getResources(),
intent);
String batterySummary = context.getResources().getString(
R.string.power_usage_level_and_status, batteryLevel, batteryStatus);
mBatteryStatusPref.setTitle(batterySummary);
if (Intent.ACTION_BATTERY_CHANGED.equals(action)
&& updateBatteryStatus(intent)) {
mStatsHelper.clearStats();
refreshStats();
}
@@ -107,8 +104,8 @@ public class PowerUsageSummary extends PreferenceFragment {
@Override
public void onResume() {
super.onResume();
getActivity().registerReceiver(mBatteryInfoReceiver,
new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
updateBatteryStatus(getActivity().registerReceiver(mBatteryInfoReceiver,
new IntentFilter(Intent.ACTION_BATTERY_CHANGED)));
refreshStats();
}
@@ -194,12 +191,32 @@ public class PowerUsageSummary extends PreferenceFragment {
mAppListGroup.addPreference(notAvailable);
}
private boolean updateBatteryStatus(Intent intent) {
if (intent != null) {
String batteryLevel = com.android.settings.Utils.getBatteryPercentage(intent);
String batteryStatus = com.android.settings.Utils.getBatteryStatus(getResources(),
intent);
if (!batteryLevel.equals(mBatteryLevel) || !batteryStatus.equals(mBatteryStatus)) {
mBatteryLevel = batteryLevel;
mBatteryStatus = batteryStatus;
return true;
}
}
return false;
}
private void refreshStats() {
mAppListGroup.removeAll();
mAppListGroup.setOrderingAsAdded(false);
mBatteryStatusPref.setOrder(-2);
if (mBatteryLevel != null && mBatteryStatus != null) {
String batterySummary = getActivity().getResources().getString(
R.string.power_usage_level_and_status, mBatteryLevel, mBatteryStatus);
mBatteryStatusPref.setTitle(batterySummary);
}
mAppListGroup.addPreference(mBatteryStatusPref);
BatteryHistoryPreference hist = new BatteryHistoryPreference(
getActivity(), mStatsHelper.getStats());
hist.setOrder(-1);