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

Merge "Update Battery Settings for Enterprise"

Browse Source
This commit is contained in:
Zoltan Szatmary-Ban
2014-07-11 13:10:39 +00:00
committed by Android (Google) Code Review
parent cd6fdead7c 298f325f54
commit 36d2bdaddd
1 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,8 @@ import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import java.util.List; import java.util.List;
import java.util.ArrayList;
import java.util.Collections;
/** /**
* Displays a list of apps and subsystems that consume power, ordered by how much power was * Displays a list of apps and subsystems that consume power, ordered by how much power was
@@ -72,8 +74,10 @@ public class PowerUsageSummary extends PreferenceFragment {
private int mStatsType = BatteryStats.STATS_SINCE_CHARGED; private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
private static final int MIN_POWER_THRESHOLD = 5; private static final int MIN_POWER_THRESHOLD_MILLI_AMP = 5;
private static final int MAX_ITEMS_TO_LIST = 10; private static final int MAX_ITEMS_TO_LIST = 10;
private static final int MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP = 10;
private static final int SECONDS_IN_HOUR = 60 * 60;
private BatteryStatsHelper mStatsHelper; private BatteryStatsHelper mStatsHelper;
@@ -241,43 +245,52 @@ public class PowerUsageSummary extends PreferenceFragment {
private void refreshStats() { private void refreshStats() {
mAppListGroup.removeAll(); mAppListGroup.removeAll();
mAppListGroup.setOrderingAsAdded(false); mAppListGroup.setOrderingAsAdded(false);
mHistPref = new BatteryHistoryPreference(getActivity(), mStatsHelper.getStats(),
mStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, UserHandle.myUserId()); mStatsHelper.getBatteryBroadcast());
mHistPref = new BatteryHistoryPreference(
getActivity(), mStatsHelper.getStats(), mStatsHelper.getBatteryBroadcast());
mHistPref.setOrder(-1); mHistPref.setOrder(-1);
mAppListGroup.addPreference(mHistPref); mAppListGroup.addPreference(mHistPref);
if (mStatsHelper.getPowerProfile().getAveragePower(
PowerProfile.POWER_SCREEN_FULL) < 10) {
addNotAvailableMessage();
return;
}
boolean addedSome = false; boolean addedSome = false;
final int dischargeAmount = mStatsHelper.getStats().getDischargeAmount(mStatsType);
List<BatterySipper> usageList = mStatsHelper.getUsageList(); PowerProfile powerProfile = mStatsHelper.getPowerProfile();
for (int i=0; i<usageList.size(); i++) { final double averagePower = powerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
BatterySipper sipper = usageList.get(i); if (averagePower >= MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP) {
if ((sipper.value*60*60) < MIN_POWER_THRESHOLD) continue; final List<UserHandle> profiles = mUm.getUserProfiles();
final double percentOfTotal =
((sipper.value / mStatsHelper.getTotalPower()) * dischargeAmount); mStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, profiles);
if (((int)(percentOfTotal+.5)) < 1) continue;
BatteryEntry entry = new BatteryEntry(getActivity(), mHandler, mUm, sipper); final List<BatterySipper> usageList = mStatsHelper.getUsageList();
PowerGaugePreference pref =
new PowerGaugePreference(getActivity(), entry.getIcon(), entry); final int dischargeAmount = mStatsHelper.getStats().getDischargeAmount(mStatsType);
final double percentOfMax = final int numSippers = usageList.size();
(sipper.value * 100) / mStatsHelper.getMaxPower(); for (int i = 0; i < numSippers; i++) {
sipper.percent = percentOfTotal; final BatterySipper sipper = usageList.get(i);
pref.setTitle(entry.getLabel()); if ((sipper.value * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP) {
pref.setOrder(i+1); continue;
pref.setPercent(percentOfMax, percentOfTotal); }
if (sipper.uidObj != null) { final double percentOfTotal =
pref.setKey(Integer.toString(sipper.uidObj.getUid())); ((sipper.value / mStatsHelper.getTotalPower()) * dischargeAmount);
if (((int) (percentOfTotal + .5)) < 1) {
continue;
}
final UserHandle userHandle = new UserHandle(UserHandle.getUserId(sipper.getUid()));
final BatteryEntry entry = new BatteryEntry(getActivity(), mHandler, mUm, sipper);
final PowerGaugePreference pref = new PowerGaugePreference(getActivity(),
mUm.getBadgedDrawableForUser(entry.getIcon(), userHandle), entry);
final double percentOfMax = (sipper.value * 100) / mStatsHelper.getMaxPower();
sipper.percent = percentOfTotal;
pref.setTitle(entry.getLabel());
pref.setOrder(i + 1);
pref.setPercent(percentOfMax, percentOfTotal);
if (sipper.uidObj != null) {
pref.setKey(Integer.toString(sipper.uidObj.getUid()));
}
addedSome = true;
mAppListGroup.addPreference(pref);
if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST + 1)) {
break;
}
} }
addedSome = true;
mAppListGroup.addPreference(pref);
if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST+1)) break;
} }
if (!addedSome) { if (!addedSome) {
addNotAvailableMessage(); addNotAvailableMessage();