Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cd935c8 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Pull pref summaries from power usage summary" into nyc-dev

parents 3095c77d e0451761

src/com/android/settings/fuelgauge/PowerUsageSummary.java

+0 −7
Original line number Diff line number Diff line
@@ -279,7 +279,6 @@ public class PowerUsageSummary extends PowerUsageBase { 


    protected void refreshStats() {

        super.refreshStats();

        PowerWhitelistBackend powerWhiteist = PowerWhitelistBackend.getInstance();

        updatePreference(mHistPref);

        cacheRemoveAllPrefs(mAppListGroup);

        mAppListGroup.setOrderingAsAdded(false);
@@ -360,12 +359,6 @@ public class PowerUsageSummary extends PowerUsageBase { 
                pref.setTitle(entry.getLabel());

                pref.setOrder(i + 1);

                pref.setPercent(percentOfMax, percentOfTotal);

                if (sipper.drainType == DrainType.APP) {

                    pref.setSummary(powerWhiteist.isWhitelisted(entry.defaultPackageName)

                            || powerWhiteist.isSysWhitelisted(entry.defaultPackageName)

                            ? getString(R.string.not_battery_optimizing)

                            : null);

                }

                if (sipper.uidObj != null) {

                    pref.setKey(Integer.toString(sipper.uidObj.getUid()));

                }