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

Commit 83a47bfa authored by ykhung's avatar ykhung Committed by Automerger Merge Worker
Browse files

Format BatteryEntry and BatteryDiffEntry class am: b593e00a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782705



Change-Id: I1193e3e0638dab1b35865f8523cf08764fb0d58d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7511d1ed b593e00a

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

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        launchArgs.mPackageName = entry.getDefaultPackageName();

        launchArgs.mAppLabel = entry.getLabel();

        launchArgs.mUid = entry.getUid();

        launchArgs.mIconId = entry.iconId;

        launchArgs.mIconId = entry.mIconId;

        launchArgs.mConsumedPower = (int) entry.getConsumedPower();

        launchArgs.mForegroundTimeMs = isValidToShowSummary ? entry.getTimeInForegroundMs() : 0;

        launchArgs.mBackgroundTimeMs = isValidToShowSummary ? entry.getTimeInBackgroundMs() : 0;

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

+4 −4
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro 
                        final int userId = UserHandle.getUserId(entry.getUid());

                        final UserHandle userHandle = new UserHandle(userId);

                        pgp.setIcon(mUserManager.getBadgedIconForUser(entry.getIcon(), userHandle));

                        pgp.setTitle(entry.name);

                        pgp.setTitle(entry.mName);

                        if (entry.isAppEntry()) {

                            pgp.setContentDescription(entry.name);

                            pgp.setContentDescription(entry.mName);

                        }

                    }

                    break;
@@ -249,7 +249,7 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro 
                            contentDescription, entry);

                    pref.setKey(key);

                }

                entry.percent = percentOfTotal;

                entry.mPercent = percentOfTotal;

                pref.setTitle(entry.getLabel());

                pref.setOrder(i + 1);

                pref.setPercent(percentOfTotal);
@@ -288,7 +288,7 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro 
            final BatteryEntry entry = usageList.get(i);

            final double percentOfTotal = mBatteryUtils.calculateBatteryPercent(

                    entry.getConsumedPower(), totalPower, dischargePercentage);

            entry.percent = percentOfTotal;

            entry.mPercent = percentOfTotal;

        }

        return usageList;

    }

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

+16 −16
Original line number Diff line number Diff line
@@ -171,9 +171,9 @@ public class BatteryDiffEntry { 
        // Checks whether we have cached data or not first before fetching.

        final BatteryEntry.NameAndIcon nameAndIcon = getCache();

        if (nameAndIcon != null) {

            mAppLabel = nameAndIcon.name;

            mAppIcon = nameAndIcon.icon;

            mAppIconId = nameAndIcon.iconId;

            mAppLabel = nameAndIcon.mName;

            mAppIcon = nameAndIcon.mIcon;

            mAppIconId = nameAndIcon.mIconId;

        }

        final Boolean validForRestriction = sValidForRestriction.get(getKey());

        if (validForRestriction != null) {
@@ -196,8 +196,8 @@ public class BatteryDiffEntry { 
                    BatteryEntry.getNameAndIconFromUserId(

                        mContext, (int) mBatteryHistEntry.mUserId);

                if (nameAndIconForUser != null) {

                    mAppIcon = nameAndIconForUser.icon;

                    mAppLabel = nameAndIconForUser.name;

                    mAppIcon = nameAndIconForUser.mIcon;

                    mAppLabel = nameAndIconForUser.mName;

                    sResourceCache.put(

                        getKey(),

                        new BatteryEntry.NameAndIcon(mAppLabel, mAppIcon, /*iconId=*/ 0));
@@ -208,10 +208,10 @@ public class BatteryDiffEntry { 
                    BatteryEntry.getNameAndIconFromPowerComponent(

                        mContext, mBatteryHistEntry.mDrainType);

                if (nameAndIconForSystem != null) {

                    mAppLabel = nameAndIconForSystem.name;

                    if (nameAndIconForSystem.iconId != 0) {

                        mAppIconId = nameAndIconForSystem.iconId;

                        mAppIcon = mContext.getDrawable(nameAndIconForSystem.iconId);

                    mAppLabel = nameAndIconForSystem.mName;

                    if (nameAndIconForSystem.mIconId != 0) {

                        mAppIconId = nameAndIconForSystem.mIconId;

                        mAppIcon = mContext.getDrawable(nameAndIconForSystem.mIconId);

                    }

                    sResourceCache.put(

                        getKey(),
@@ -308,8 +308,8 @@ public class BatteryDiffEntry { 
        if (packages == null || packages.length == 0) {

            final BatteryEntry.NameAndIcon nameAndIcon =

                BatteryEntry.getNameAndIconFromUid(mContext, mAppLabel, uid);

            mAppLabel = nameAndIcon.name;

            mAppIcon = nameAndIcon.icon;

            mAppLabel = nameAndIcon.mName;

            mAppIcon = nameAndIcon.mIcon;

        }



        final BatteryEntry.NameAndIcon nameAndIcon =
@@ -319,13 +319,13 @@ public class BatteryDiffEntry { 
        // Clears BatteryEntry internal cache since we will have another one.

        BatteryEntry.clearUidCache();

        if (nameAndIcon != null) {

            mAppLabel = nameAndIcon.name;

            mAppIcon = nameAndIcon.icon;

            mDefaultPackageName = nameAndIcon.packageName;

            mAppLabel = nameAndIcon.mName;

            mAppIcon = nameAndIcon.mIcon;

            mDefaultPackageName = nameAndIcon.mPackageName;

            if (mDefaultPackageName != null

                    && !mDefaultPackageName.equals(nameAndIcon.packageName)) {

                    && !mDefaultPackageName.equals(nameAndIcon.mPackageName)) {

                Log.w(TAG, String.format("found different package: %s | %s",

                    mDefaultPackageName, nameAndIcon.packageName));

                    mDefaultPackageName, nameAndIcon.mPackageName));

            }

        }

    }

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

+58 −80
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ import java.util.Locale; 
public class BatteryEntry {



    public static final class NameAndIcon {

        public final String name;

        public final String packageName;

        public final Drawable icon;

        public final int iconId;

        public final String mName;

        public final String mPackageName;

        public final Drawable mIcon;

        public final int mIconId;



        public NameAndIcon(String name, Drawable icon, int iconId) {

            this(name, /*packageName=*/ null, icon, iconId);
@@ -64,10 +64,10 @@ public class BatteryEntry { 


        public NameAndIcon(

                String name, String packageName, Drawable icon, int iconId) {

            this.name = name;

            this.icon = icon;

            this.iconId = iconId;

            this.packageName = packageName;

            this.mName = name;

            this.mIcon = icon;

            this.mIconId = iconId;

            this.mPackageName = packageName;

        }

    }
@@ -111,11 +111,11 @@ public class BatteryEntry { 
                final NameAndIcon nameAndIcon =

                    BatteryEntry.loadNameAndIcon(

                        be.mContext, be.getUid(), sHandler, be,

                        be.mDefaultPackageName, be.name, be.icon);

                        be.mDefaultPackageName, be.mName, be.mIcon);

                if (nameAndIcon != null) {

                    be.icon = nameAndIcon.icon;

                    be.name = nameAndIcon.name;

                    be.mDefaultPackageName = nameAndIcon.packageName;

                    be.mIcon = nameAndIcon.mIcon;

                    be.mName = nameAndIcon.mName;

                    be.mDefaultPackageName = nameAndIcon.mPackageName;

                }

            }

        }
@@ -169,27 +169,27 @@ public class BatteryEntry { 
    private long mTimeInForegroundMs;

    private long mTimeInBackgroundMs;



    public String name;

    public Drawable icon;

    public int iconId; // For passing to the detail screen.

    public double percent;

    public String mName;

    public Drawable mIcon;

    public int mIconId;

    public double mPercent;

    private String mDefaultPackageName;

    private double mConsumedPower;



    static class UidToDetail {

        String name;

        String packageName;

        Drawable icon;

        String mName;

        String mPackageName;

        Drawable mIcon;

    }



    public BatteryEntry(Context context, Handler handler, UserManager um,

            @NonNull BatteryConsumer batteryConsumer, boolean isHidden, int uid, String[] packages,

            BatteryConsumer batteryConsumer, boolean isHidden, int uid, String[] packages,

            String packageName) {

        this(context, handler, um, batteryConsumer, isHidden, uid, packages, packageName, true);

    }



    public BatteryEntry(Context context, Handler handler, UserManager um,

            @NonNull BatteryConsumer batteryConsumer, boolean isHidden, int uid, String[] packages,

            BatteryConsumer batteryConsumer, boolean isHidden, int uid, String[] packages,

            String packageName, boolean loadDataInBackground) {

        sHandler = handler;

        mContext = context;
@@ -217,11 +217,11 @@ public class BatteryEntry { 
                try {

                    ApplicationInfo appInfo =

                            pm.getApplicationInfo(mDefaultPackageName, 0 /* no flags */);

                    name = pm.getApplicationLabel(appInfo).toString();

                    mName = pm.getApplicationLabel(appInfo).toString();

                } catch (NameNotFoundException e) {

                    Log.d(TAG, "PackageManager failed to retrieve ApplicationInfo for: "

                            + mDefaultPackageName);

                    name = mDefaultPackageName;

                    mName = mDefaultPackageName;

                }

            }

            getQuickNameIconForUid(uid, packages, loadDataInBackground);
@@ -235,10 +235,10 @@ public class BatteryEntry { 
            mConsumedPower = batteryConsumer.getConsumedPower();

            final NameAndIcon nameAndIcon = getNameAndIconFromUserId(

                    context, ((UserBatteryConsumer) batteryConsumer).getUserId());

            icon = nameAndIcon.icon;

            name = nameAndIcon.name;

            mIcon = nameAndIcon.mIcon;

            mName = nameAndIcon.mName;

        } else {

            throw new IllegalArgumentException("Unsupported battery consumer: " + batteryConsumer);

            throw new IllegalArgumentException("Unsupported: " + batteryConsumer);

        }

    }
@@ -257,11 +257,12 @@ public class BatteryEntry { 
        mUsageDurationMs = usageDurationMs;

        mConsumerType = ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY;



        final NameAndIcon nameAndIcon = getNameAndIconFromPowerComponent(context, powerComponentId);

        iconId = nameAndIcon.iconId;

        name = nameAndIcon.name;

        if (iconId != 0) {

            icon = context.getDrawable(iconId);

        final NameAndIcon nameAndIcon =

            getNameAndIconFromPowerComponent(context, powerComponentId);

        mIconId = nameAndIcon.mIconId;

        mName = nameAndIcon.mName;

        if (mIconId != 0) {

            mIcon = context.getDrawable(mIconId);

        }

    }
@@ -274,9 +275,9 @@ public class BatteryEntry { 
        mIsHidden = false;

        mPowerComponentId = powerComponentId;



        iconId = R.drawable.ic_power_system;

        icon = context.getDrawable(iconId);

        name = powerComponentName;

        mIconId = R.drawable.ic_power_system;

        mIcon = context.getDrawable(mIconId);

        mName = powerComponentName;

        mConsumedPower =

            powerComponentId == BatteryConsumer.POWER_COMPONENT_SCREEN

                ? devicePowerMah
@@ -285,14 +286,11 @@ public class BatteryEntry { 
    }



    public Drawable getIcon() {

        return icon;

        return mIcon;

    }



    /**

     * Gets the application name

     */

    public String getLabel() {

        return name;

        return mName;

    }



    @ConvertUtils.ConsumerType
@@ -317,18 +315,18 @@ public class BatteryEntry { 
        final String uidString = Integer.toString(uid);

        if (sUidCache.containsKey(uidString)) {

            UidToDetail utd = sUidCache.get(uidString);

            mDefaultPackageName = utd.packageName;

            name = utd.name;

            icon = utd.icon;

            mDefaultPackageName = utd.mPackageName;

            mName = utd.mName;

            mIcon = utd.mIcon;

            return;

        }



        if (packages == null || packages.length == 0) {

            final NameAndIcon nameAndIcon = getNameAndIconFromUid(mContext, name, uid);

            icon = nameAndIcon.icon;

            name = nameAndIcon.name;

            final NameAndIcon nameAndIcon = getNameAndIconFromUid(mContext, mName, uid);

            mIcon = nameAndIcon.mIcon;

            mName = nameAndIcon.mName;

        } else {

            icon = mContext.getPackageManager().getDefaultActivityIcon();

            mIcon = mContext.getPackageManager().getDefaultActivityIcon();

        }



        // Avoids post the loading icon and label in the background request.
@@ -339,9 +337,7 @@ public class BatteryEntry { 
        }

    }



    /**

     * Loads the app label and icon image and stores into the cache.

     */

    /** Loads the app label and icon image and stores into the cache. */

    public static NameAndIcon loadNameAndIcon(

            Context context,

            int uid,
@@ -400,7 +396,7 @@ public class BatteryEntry { 
                // Look for an official name for this UID.

                for (String pkgName : packages) {

                    try {

                        final PackageInfo pi = ipm.getPackageInfo(pkgName, 0 /* no flags */, userId);

                        final PackageInfo pi = ipm.getPackageInfo(pkgName, 0, userId);

                        if (pi == null) {

                            Log.d(TAG, "Retrieving null package info for package "

                                    + pkgName + ", user " + userId);
@@ -432,9 +428,9 @@ public class BatteryEntry { 
        }



        UidToDetail utd = new UidToDetail();

        utd.name = name;

        utd.icon = icon;

        utd.packageName = defaultPackageName;

        utd.mName = name;

        utd.mIcon = icon;

        utd.mPackageName = defaultPackageName;



        sUidCache.put(uidString, utd);

        if (handler != null) {
@@ -443,9 +439,7 @@ public class BatteryEntry { 
        return new NameAndIcon(name, defaultPackageName, icon, /*iconId=*/ 0);

    }



    /**

     * Returns a string that uniquely identifies this battery consumer.

     */

    /** Returns a string that uniquely identifies this battery consumer. */

    public String getKey() {

        if (mBatteryConsumer instanceof UidBatteryConsumer) {

            return Integer.toString(mUid);
@@ -456,23 +450,17 @@ public class BatteryEntry { 
        }

    }



    /**

     * Returns true if the entry is hidden from the battery usage summary list.

     */

    /** Returns true if the entry is hidden from the battery usage summary list. */

    public boolean isHidden() {

        return mIsHidden;

    }



    /**

     * Returns true if this entry describes an app (UID)

     */

    /** Returns true if this entry describes an app (UID). */

    public boolean isAppEntry() {

        return mBatteryConsumer instanceof UidBatteryConsumer;

    }



    /**

     * Returns true if this entry describes a User.

     */

    /** Returns true if this entry describes a User. */

    public boolean isUserEntry() {

        if (mBatteryConsumer instanceof UserBatteryConsumer) {

            return true;
@@ -495,9 +483,7 @@ public class BatteryEntry { 
        return mUid;

    }



    /**

     * Returns foreground foreground time (in milliseconds) that is attributed to this entry.

     */

    /** Returns foreground foreground time/ms that is attributed to this entry. */

    public long getTimeInForegroundMs() {

        if (mBatteryConsumer instanceof UidBatteryConsumer) {

            return mTimeInForegroundMs;
@@ -506,9 +492,7 @@ public class BatteryEntry { 
        }

    }



    /**

     * Returns background activity time (in milliseconds) that is attributed to this entry.

     */

    /** Returns background activity time/ms that is attributed to this entry. */

    public long getTimeInBackgroundMs() {

        if (mBatteryConsumer instanceof UidBatteryConsumer) {

            return mTimeInBackgroundMs;
@@ -542,9 +526,7 @@ public class BatteryEntry { 
        }

    }



    /**

     * Gets name and icon resource from UserBatteryConsumer userId.

     */

    /** Gets name and icon resource from UserBatteryConsumer userId. */

    public static NameAndIcon getNameAndIconFromUserId(

            Context context, final int userId) {

        UserManager um = context.getSystemService(UserManager.class);
@@ -562,9 +544,7 @@ public class BatteryEntry { 
        return new NameAndIcon(name, icon, 0 /* iconId */);

    }



    /**

     * Gets name and icon resource from UidBatteryConsumer uid.

     */

    /** Gets name and icon resource from UidBatteryConsumer uid. */

    public static NameAndIcon getNameAndIconFromUid(

            Context context, String name, final int uid) {

        Drawable icon = context.getDrawable(R.drawable.ic_power_system);
@@ -579,9 +559,7 @@ public class BatteryEntry { 
        return new NameAndIcon(name, icon, 0 /* iconId */);

    }



    /**

     * Gets name and icon resource from BatteryConsumer power component ID.

     */

    /** Gets name and icon resource from BatteryConsumer power component ID. */

    public static NameAndIcon getNameAndIconFromPowerComponent(

            Context context, @BatteryConsumer.PowerComponent int powerComponentId) {

        String name;

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

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public final class ConvertUtils { 
            values.put(BatteryHistEntry.KEY_CONSUME_POWER,

                Double.valueOf(entry.getConsumedPower()));

            values.put(BatteryHistEntry.KEY_PERCENT_OF_TOTAL,

                Double.valueOf(entry.percent));

                Double.valueOf(entry.mPercent));

            values.put(BatteryHistEntry.KEY_FOREGROUND_USAGE_TIME,

                Long.valueOf(entry.getTimeInForegroundMs()));

            values.put(BatteryHistEntry.KEY_BACKGROUND_USAGE_TIME,