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

Format BatteryEntry and BatteryDiffEntry class

Browse Source 
Bug: N/A
Test: make RunSettingsRoboTests
Change-Id: I14e2ef4c455209e58edc5ccdbe064f469815cccd
This commit is contained in:
ykhung
2022-04-17 11:17:11 +08:00
committed by YK Hung
parent c4801433d9
commit b593e00af0
10 changed files with 102 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -172,7 +172,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
launchArgs.mPackageName = entry.getDefaultPackageName(); launchArgs.mPackageName = entry.getDefaultPackageName();
launchArgs.mAppLabel = entry.getLabel(); launchArgs.mAppLabel = entry.getLabel();
launchArgs.mUid = entry.getUid(); launchArgs.mUid = entry.getUid();
launchArgs.mIconId = entry.iconId; launchArgs.mIconId = entry.mIconId;
launchArgs.mConsumedPower = (int) entry.getConsumedPower(); launchArgs.mConsumedPower = (int) entry.getConsumedPower();
launchArgs.mForegroundTimeMs = isValidToShowSummary ? entry.getTimeInForegroundMs() : 0; launchArgs.mForegroundTimeMs = isValidToShowSummary ? entry.getTimeInForegroundMs() : 0;
launchArgs.mBackgroundTimeMs = isValidToShowSummary ? entry.getTimeInBackgroundMs() : 0; launchArgs.mBackgroundTimeMs = isValidToShowSummary ? entry.getTimeInBackgroundMs() : 0;

8
src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
View File

@@ -127,9 +127,9 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro
final int userId = UserHandle.getUserId(entry.getUid()); final int userId = UserHandle.getUserId(entry.getUid());
final UserHandle userHandle = new UserHandle(userId); final UserHandle userHandle = new UserHandle(userId);
pgp.setIcon(mUserManager.getBadgedIconForUser(entry.getIcon(), userHandle)); pgp.setIcon(mUserManager.getBadgedIconForUser(entry.getIcon(), userHandle));
pgp.setTitle(entry.name); pgp.setTitle(entry.mName);
if (entry.isAppEntry()) { if (entry.isAppEntry()) {
pgp.setContentDescription(entry.name); pgp.setContentDescription(entry.mName);
} }
} }
break; break;
@@ -249,7 +249,7 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro
contentDescription, entry); contentDescription, entry);
pref.setKey(key); pref.setKey(key);
} }
entry.percent = percentOfTotal; entry.mPercent = percentOfTotal;
pref.setTitle(entry.getLabel()); pref.setTitle(entry.getLabel());
pref.setOrder(i + 1); pref.setOrder(i + 1);
pref.setPercent(percentOfTotal); pref.setPercent(percentOfTotal);
@@ -288,7 +288,7 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro
final BatteryEntry entry = usageList.get(i); final BatteryEntry entry = usageList.get(i);
final double percentOfTotal = mBatteryUtils.calculateBatteryPercent( final double percentOfTotal = mBatteryUtils.calculateBatteryPercent(
entry.getConsumedPower(), totalPower, dischargePercentage); entry.getConsumedPower(), totalPower, dischargePercentage);
entry.percent = percentOfTotal; entry.mPercent = percentOfTotal;
} }
return usageList; return usageList;
} }

32
src/com/android/settings/fuelgauge/BatteryDiffEntry.java
View File

@@ -171,9 +171,9 @@ public class BatteryDiffEntry {
// Checks whether we have cached data or not first before fetching. // Checks whether we have cached data or not first before fetching.
final BatteryEntry.NameAndIcon nameAndIcon = getCache(); final BatteryEntry.NameAndIcon nameAndIcon = getCache();
if (nameAndIcon != null) { if (nameAndIcon != null) {
mAppLabel = nameAndIcon.name; mAppLabel = nameAndIcon.mName;
mAppIcon = nameAndIcon.icon; mAppIcon = nameAndIcon.mIcon;
mAppIconId = nameAndIcon.iconId; mAppIconId = nameAndIcon.mIconId;
} }
final Boolean validForRestriction = sValidForRestriction.get(getKey()); final Boolean validForRestriction = sValidForRestriction.get(getKey());
if (validForRestriction != null) { if (validForRestriction != null) {
@@ -196,8 +196,8 @@ public class BatteryDiffEntry {
BatteryEntry.getNameAndIconFromUserId( BatteryEntry.getNameAndIconFromUserId(
mContext, (int) mBatteryHistEntry.mUserId); mContext, (int) mBatteryHistEntry.mUserId);
if (nameAndIconForUser != null) { if (nameAndIconForUser != null) {
mAppIcon = nameAndIconForUser.icon; mAppIcon = nameAndIconForUser.mIcon;
mAppLabel = nameAndIconForUser.name; mAppLabel = nameAndIconForUser.mName;
sResourceCache.put( sResourceCache.put(
getKey(), getKey(),
new BatteryEntry.NameAndIcon(mAppLabel, mAppIcon, /*iconId=*/ 0)); new BatteryEntry.NameAndIcon(mAppLabel, mAppIcon, /*iconId=*/ 0));
@@ -208,10 +208,10 @@ public class BatteryDiffEntry {
BatteryEntry.getNameAndIconFromPowerComponent( BatteryEntry.getNameAndIconFromPowerComponent(
mContext, mBatteryHistEntry.mDrainType); mContext, mBatteryHistEntry.mDrainType);
if (nameAndIconForSystem != null) { if (nameAndIconForSystem != null) {
mAppLabel = nameAndIconForSystem.name; mAppLabel = nameAndIconForSystem.mName;
if (nameAndIconForSystem.iconId != 0) { if (nameAndIconForSystem.mIconId != 0) {
mAppIconId = nameAndIconForSystem.iconId; mAppIconId = nameAndIconForSystem.mIconId;
mAppIcon = mContext.getDrawable(nameAndIconForSystem.iconId); mAppIcon = mContext.getDrawable(nameAndIconForSystem.mIconId);
} }
sResourceCache.put( sResourceCache.put(
getKey(), getKey(),
@@ -308,8 +308,8 @@ public class BatteryDiffEntry {
if (packages == null || packages.length == 0) { if (packages == null || packages.length == 0) {
final BatteryEntry.NameAndIcon nameAndIcon = final BatteryEntry.NameAndIcon nameAndIcon =
BatteryEntry.getNameAndIconFromUid(mContext, mAppLabel, uid); BatteryEntry.getNameAndIconFromUid(mContext, mAppLabel, uid);
mAppLabel = nameAndIcon.name; mAppLabel = nameAndIcon.mName;
mAppIcon = nameAndIcon.icon; mAppIcon = nameAndIcon.mIcon;
} }
final BatteryEntry.NameAndIcon nameAndIcon = final BatteryEntry.NameAndIcon nameAndIcon =
@@ -319,13 +319,13 @@ public class BatteryDiffEntry {
// Clears BatteryEntry internal cache since we will have another one. // Clears BatteryEntry internal cache since we will have another one.
BatteryEntry.clearUidCache(); BatteryEntry.clearUidCache();
if (nameAndIcon != null) { if (nameAndIcon != null) {
mAppLabel = nameAndIcon.name; mAppLabel = nameAndIcon.mName;
mAppIcon = nameAndIcon.icon; mAppIcon = nameAndIcon.mIcon;
mDefaultPackageName = nameAndIcon.packageName; mDefaultPackageName = nameAndIcon.mPackageName;
if (mDefaultPackageName != null if (mDefaultPackageName != null
&& !mDefaultPackageName.equals(nameAndIcon.packageName)) { && !mDefaultPackageName.equals(nameAndIcon.mPackageName)) {
Log.w(TAG, String.format("found different package: %s | %s", Log.w(TAG, String.format("found different package: %s | %s",
mDefaultPackageName, nameAndIcon.packageName)); mDefaultPackageName, nameAndIcon.mPackageName));
} }
} }
} }

138
src/com/android/settings/fuelgauge/BatteryEntry.java
View File

@@ -53,10 +53,10 @@ import java.util.Locale;
public class BatteryEntry { public class BatteryEntry {
public static final class NameAndIcon { public static final class NameAndIcon {
public final String name; public final String mName;
public final String packageName; public final String mPackageName;
public final Drawable icon; public final Drawable mIcon;
public final int iconId; public final int mIconId;
public NameAndIcon(String name, Drawable icon, int iconId) { public NameAndIcon(String name, Drawable icon, int iconId) {
this(name, /*packageName=*/ null, icon, iconId); this(name, /*packageName=*/ null, icon, iconId);
@@ -64,10 +64,10 @@ public class BatteryEntry {
public NameAndIcon( public NameAndIcon(
String name, String packageName, Drawable icon, int iconId) { String name, String packageName, Drawable icon, int iconId) {
this.name = name; this.mName = name;
this.icon = icon; this.mIcon = icon;
this.iconId = iconId; this.mIconId = iconId;
this.packageName = packageName; this.mPackageName = packageName;
} }
} }
@@ -111,11 +111,11 @@ public class BatteryEntry {
final NameAndIcon nameAndIcon = final NameAndIcon nameAndIcon =
BatteryEntry.loadNameAndIcon( BatteryEntry.loadNameAndIcon(
be.mContext, be.getUid(), sHandler, be, be.mContext, be.getUid(), sHandler, be,
be.mDefaultPackageName, be.name, be.icon); be.mDefaultPackageName, be.mName, be.mIcon);
if (nameAndIcon != null) { if (nameAndIcon != null) {
be.icon = nameAndIcon.icon; be.mIcon = nameAndIcon.mIcon;
be.name = nameAndIcon.name; be.mName = nameAndIcon.mName;
be.mDefaultPackageName = nameAndIcon.packageName; be.mDefaultPackageName = nameAndIcon.mPackageName;
} }
} }
} }
@@ -169,27 +169,27 @@ public class BatteryEntry {
private long mTimeInForegroundMs; private long mTimeInForegroundMs;
private long mTimeInBackgroundMs; private long mTimeInBackgroundMs;
public String name; public String mName;
public Drawable icon; public Drawable mIcon;
public int iconId; // For passing to the detail screen. public int mIconId;
public double percent; public double mPercent;
private String mDefaultPackageName; private String mDefaultPackageName;
private double mConsumedPower; private double mConsumedPower;
static class UidToDetail { static class UidToDetail {
String name; String mName;
String packageName; String mPackageName;
Drawable icon; Drawable mIcon;
} }
public BatteryEntry(Context context, Handler handler, UserManager um, 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) { String packageName) {
this(context, handler, um, batteryConsumer, isHidden, uid, packages, packageName, true); this(context, handler, um, batteryConsumer, isHidden, uid, packages, packageName, true);
} }
public BatteryEntry(Context context, Handler handler, UserManager um, 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) { String packageName, boolean loadDataInBackground) {
sHandler = handler; sHandler = handler;
mContext = context; mContext = context;
@@ -217,11 +217,11 @@ public class BatteryEntry {
try { try {
ApplicationInfo appInfo = ApplicationInfo appInfo =
pm.getApplicationInfo(mDefaultPackageName, 0 /* no flags */); pm.getApplicationInfo(mDefaultPackageName, 0 /* no flags */);
name = pm.getApplicationLabel(appInfo).toString(); mName = pm.getApplicationLabel(appInfo).toString();
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
Log.d(TAG, "PackageManager failed to retrieve ApplicationInfo for: " Log.d(TAG, "PackageManager failed to retrieve ApplicationInfo for: "
+ mDefaultPackageName); + mDefaultPackageName);
name = mDefaultPackageName; mName = mDefaultPackageName;
} }
} }
getQuickNameIconForUid(uid, packages, loadDataInBackground); getQuickNameIconForUid(uid, packages, loadDataInBackground);
@@ -235,10 +235,10 @@ public class BatteryEntry {
mConsumedPower = batteryConsumer.getConsumedPower(); mConsumedPower = batteryConsumer.getConsumedPower();
final NameAndIcon nameAndIcon = getNameAndIconFromUserId( final NameAndIcon nameAndIcon = getNameAndIconFromUserId(
context, ((UserBatteryConsumer) batteryConsumer).getUserId()); context, ((UserBatteryConsumer) batteryConsumer).getUserId());
icon = nameAndIcon.icon; mIcon = nameAndIcon.mIcon;
name = nameAndIcon.name; mName = nameAndIcon.mName;
} else { } else {
throw new IllegalArgumentException("Unsupported battery consumer: " + batteryConsumer); throw new IllegalArgumentException("Unsupported: " + batteryConsumer);
} }
} }
@@ -257,11 +257,12 @@ public class BatteryEntry {
mUsageDurationMs = usageDurationMs; mUsageDurationMs = usageDurationMs;
mConsumerType = ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY; mConsumerType = ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY;
final NameAndIcon nameAndIcon = getNameAndIconFromPowerComponent(context, powerComponentId); final NameAndIcon nameAndIcon =
iconId = nameAndIcon.iconId; getNameAndIconFromPowerComponent(context, powerComponentId);
name = nameAndIcon.name; mIconId = nameAndIcon.mIconId;
if (iconId != 0) { mName = nameAndIcon.mName;
icon = context.getDrawable(iconId); if (mIconId != 0) {
mIcon = context.getDrawable(mIconId);
} }
} }
@@ -274,9 +275,9 @@ public class BatteryEntry {
mIsHidden = false; mIsHidden = false;
mPowerComponentId = powerComponentId; mPowerComponentId = powerComponentId;
iconId = R.drawable.ic_power_system; mIconId = R.drawable.ic_power_system;
icon = context.getDrawable(iconId); mIcon = context.getDrawable(mIconId);
name = powerComponentName; mName = powerComponentName;
mConsumedPower = mConsumedPower =
powerComponentId == BatteryConsumer.POWER_COMPONENT_SCREEN powerComponentId == BatteryConsumer.POWER_COMPONENT_SCREEN
? devicePowerMah ? devicePowerMah
@@ -285,14 +286,11 @@ public class BatteryEntry {
} }
public Drawable getIcon() { public Drawable getIcon() {
return icon; return mIcon;
} }
/**
* Gets the application name
*/
public String getLabel() { public String getLabel() {
return name; return mName;
} }
@ConvertUtils.ConsumerType @ConvertUtils.ConsumerType
@@ -317,18 +315,18 @@ public class BatteryEntry {
final String uidString = Integer.toString(uid); final String uidString = Integer.toString(uid);
if (sUidCache.containsKey(uidString)) { if (sUidCache.containsKey(uidString)) {
UidToDetail utd = sUidCache.get(uidString); UidToDetail utd = sUidCache.get(uidString);
mDefaultPackageName = utd.packageName; mDefaultPackageName = utd.mPackageName;
name = utd.name; mName = utd.mName;
icon = utd.icon; mIcon = utd.mIcon;
return; return;
} }
if (packages == null || packages.length == 0) { if (packages == null || packages.length == 0) {
final NameAndIcon nameAndIcon = getNameAndIconFromUid(mContext, name, uid); final NameAndIcon nameAndIcon = getNameAndIconFromUid(mContext, mName, uid);
icon = nameAndIcon.icon; mIcon = nameAndIcon.mIcon;
name = nameAndIcon.name; mName = nameAndIcon.mName;
} else { } else {
icon = mContext.getPackageManager().getDefaultActivityIcon(); mIcon = mContext.getPackageManager().getDefaultActivityIcon();
} }
// Avoids post the loading icon and label in the background request. // 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( public static NameAndIcon loadNameAndIcon(
Context context, Context context,
int uid, int uid,
@@ -400,7 +396,7 @@ public class BatteryEntry {
// Look for an official name for this UID. // Look for an official name for this UID.
for (String pkgName : packages) { for (String pkgName : packages) {
try { try {
final PackageInfo pi = ipm.getPackageInfo(pkgName, 0 /* no flags */, userId); final PackageInfo pi = ipm.getPackageInfo(pkgName, 0, userId);
if (pi == null) { if (pi == null) {
Log.d(TAG, "Retrieving null package info for package " Log.d(TAG, "Retrieving null package info for package "
+ pkgName + ", user " + userId); + pkgName + ", user " + userId);
@@ -432,9 +428,9 @@ public class BatteryEntry {
} }
UidToDetail utd = new UidToDetail(); UidToDetail utd = new UidToDetail();
utd.name = name; utd.mName = name;
utd.icon = icon; utd.mIcon = icon;
utd.packageName = defaultPackageName; utd.mPackageName = defaultPackageName;
sUidCache.put(uidString, utd); sUidCache.put(uidString, utd);
if (handler != null) { if (handler != null) {
@@ -443,9 +439,7 @@ public class BatteryEntry {
return new NameAndIcon(name, defaultPackageName, icon, /*iconId=*/ 0); 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() { public String getKey() {
if (mBatteryConsumer instanceof UidBatteryConsumer) { if (mBatteryConsumer instanceof UidBatteryConsumer) {
return Integer.toString(mUid); 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() { public boolean isHidden() {
return mIsHidden; return mIsHidden;
} }
/** /** Returns true if this entry describes an app (UID). */
* Returns true if this entry describes an app (UID)
*/
public boolean isAppEntry() { public boolean isAppEntry() {
return mBatteryConsumer instanceof UidBatteryConsumer; return mBatteryConsumer instanceof UidBatteryConsumer;
} }
/** /** Returns true if this entry describes a User. */
* Returns true if this entry describes a User.
*/
public boolean isUserEntry() { public boolean isUserEntry() {
if (mBatteryConsumer instanceof UserBatteryConsumer) { if (mBatteryConsumer instanceof UserBatteryConsumer) {
return true; return true;
@@ -495,9 +483,7 @@ public class BatteryEntry {
return mUid; return mUid;
} }
/** /** Returns foreground foreground time/ms that is attributed to this entry. */
* Returns foreground foreground time (in milliseconds) that is attributed to this entry.
*/
public long getTimeInForegroundMs() { public long getTimeInForegroundMs() {
if (mBatteryConsumer instanceof UidBatteryConsumer) { if (mBatteryConsumer instanceof UidBatteryConsumer) {
return mTimeInForegroundMs; return mTimeInForegroundMs;
@@ -506,9 +492,7 @@ public class BatteryEntry {
} }
} }
/** /** Returns background activity time/ms that is attributed to this entry. */
* Returns background activity time (in milliseconds) that is attributed to this entry.
*/
public long getTimeInBackgroundMs() { public long getTimeInBackgroundMs() {
if (mBatteryConsumer instanceof UidBatteryConsumer) { if (mBatteryConsumer instanceof UidBatteryConsumer) {
return mTimeInBackgroundMs; 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( public static NameAndIcon getNameAndIconFromUserId(
Context context, final int userId) { Context context, final int userId) {
UserManager um = context.getSystemService(UserManager.class); UserManager um = context.getSystemService(UserManager.class);
@@ -562,9 +544,7 @@ public class BatteryEntry {
return new NameAndIcon(name, icon, 0 /* iconId */); 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( public static NameAndIcon getNameAndIconFromUid(
Context context, String name, final int uid) { Context context, String name, final int uid) {
Drawable icon = context.getDrawable(R.drawable.ic_power_system); Drawable icon = context.getDrawable(R.drawable.ic_power_system);
@@ -579,9 +559,7 @@ public class BatteryEntry {
return new NameAndIcon(name, icon, 0 /* iconId */); 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( public static NameAndIcon getNameAndIconFromPowerComponent(
Context context, @BatteryConsumer.PowerComponent int powerComponentId) { Context context, @BatteryConsumer.PowerComponent int powerComponentId) {
String name; String name;

2
src/com/android/settings/fuelgauge/ConvertUtils.java
View File

@@ -101,7 +101,7 @@ public final class ConvertUtils {
values.put(BatteryHistEntry.KEY_CONSUME_POWER, values.put(BatteryHistEntry.KEY_CONSUME_POWER,
Double.valueOf(entry.getConsumedPower())); Double.valueOf(entry.getConsumedPower()));
values.put(BatteryHistEntry.KEY_PERCENT_OF_TOTAL, values.put(BatteryHistEntry.KEY_PERCENT_OF_TOTAL,
Double.valueOf(entry.percent)); Double.valueOf(entry.mPercent));
values.put(BatteryHistEntry.KEY_FOREGROUND_USAGE_TIME, values.put(BatteryHistEntry.KEY_FOREGROUND_USAGE_TIME,
Long.valueOf(entry.getTimeInForegroundMs())); Long.valueOf(entry.getTimeInForegroundMs()));
values.put(BatteryHistEntry.KEY_BACKGROUND_USAGE_TIME, values.put(BatteryHistEntry.KEY_BACKGROUND_USAGE_TIME,

2
tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
View File

@@ -181,7 +181,7 @@ public class AdvancedPowerUsageDetailTest {
when(mBatteryEntry.getLabel()).thenReturn(APP_LABEL); when(mBatteryEntry.getLabel()).thenReturn(APP_LABEL);
when(mBatteryEntry.getTimeInBackgroundMs()).thenReturn(BACKGROUND_TIME_MS); when(mBatteryEntry.getTimeInBackgroundMs()).thenReturn(BACKGROUND_TIME_MS);
when(mBatteryEntry.getTimeInForegroundMs()).thenReturn(FOREGROUND_TIME_MS); when(mBatteryEntry.getTimeInForegroundMs()).thenReturn(FOREGROUND_TIME_MS);
mBatteryEntry.iconId = ICON_ID; mBatteryEntry.mIconId = ICON_ID;
mFragment.mHeaderPreference = mHeaderPreference; mFragment.mHeaderPreference = mHeaderPreference;
mFragment.mState = mState; mFragment.mState = mState;

16
tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java
View File

@@ -140,8 +140,8 @@ public final class BatteryDiffEntryTest {
// Verifies the app label in the cache. // Verifies the app label in the cache.
final BatteryEntry.NameAndIcon nameAndIcon = final BatteryEntry.NameAndIcon nameAndIcon =
BatteryDiffEntry.sResourceCache.get(entry.getKey()); BatteryDiffEntry.sResourceCache.get(entry.getKey());
assertThat(nameAndIcon.name).isEqualTo(expectedName); assertThat(nameAndIcon.mName).isEqualTo(expectedName);
assertThat(nameAndIcon.iconId).isEqualTo(R.drawable.ic_settings_aod); assertThat(nameAndIcon.mIconId).isEqualTo(R.drawable.ic_settings_aod);
// Verifies the restrictable flag in the cache. // Verifies the restrictable flag in the cache.
assertThat(entry.mValidForRestriction).isTrue(); assertThat(entry.mValidForRestriction).isTrue();
assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isTrue(); assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isTrue();
@@ -166,8 +166,8 @@ public final class BatteryDiffEntryTest {
// Verifies the app label in the cache. // Verifies the app label in the cache.
final BatteryEntry.NameAndIcon nameAndIcon = final BatteryEntry.NameAndIcon nameAndIcon =
BatteryDiffEntry.sResourceCache.get(entry.getKey()); BatteryDiffEntry.sResourceCache.get(entry.getKey());
assertThat(nameAndIcon.name).isEqualTo(expectedName); assertThat(nameAndIcon.mName).isEqualTo(expectedName);
assertThat(nameAndIcon.iconId).isEqualTo(0); assertThat(nameAndIcon.mIconId).isEqualTo(0);
// Verifies the restrictable flag in the cache. // Verifies the restrictable flag in the cache.
assertThat(entry.mValidForRestriction).isTrue(); assertThat(entry.mValidForRestriction).isTrue();
assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isTrue(); assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isTrue();
@@ -195,7 +195,7 @@ public final class BatteryDiffEntryTest {
// Verifies the app label in the cache. // Verifies the app label in the cache.
final BatteryEntry.NameAndIcon nameAndIcon = final BatteryEntry.NameAndIcon nameAndIcon =
BatteryDiffEntry.sResourceCache.get(entry.getKey()); BatteryDiffEntry.sResourceCache.get(entry.getKey());
assertThat(nameAndIcon.name).isEqualTo(expectedAppLabel); assertThat(nameAndIcon.mName).isEqualTo(expectedAppLabel);
// Verifies the restrictable flag in the cache. // Verifies the restrictable flag in the cache.
assertThat(entry.mValidForRestriction).isFalse(); assertThat(entry.mValidForRestriction).isFalse();
assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isFalse(); assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isFalse();
@@ -215,7 +215,7 @@ public final class BatteryDiffEntryTest {
// Verifies the app label in the cache. // Verifies the app label in the cache.
final BatteryEntry.NameAndIcon nameAndIcon = final BatteryEntry.NameAndIcon nameAndIcon =
BatteryDiffEntry.sResourceCache.get(entry.getKey()); BatteryDiffEntry.sResourceCache.get(entry.getKey());
assertThat(nameAndIcon.name).isEqualTo(expectedAppLabel); assertThat(nameAndIcon.mName).isEqualTo(expectedAppLabel);
} }
@Test @Test
@@ -274,7 +274,7 @@ public final class BatteryDiffEntryTest {
// Verifies the app label in the cache. // Verifies the app label in the cache.
final BatteryEntry.NameAndIcon nameAndIcon = final BatteryEntry.NameAndIcon nameAndIcon =
BatteryDiffEntry.sResourceCache.get(entry.getKey()); BatteryDiffEntry.sResourceCache.get(entry.getKey());
assertThat(nameAndIcon.icon).isEqualTo(mockDrawable); assertThat(nameAndIcon.mIcon).isEqualTo(mockDrawable);
} }
@Test @Test
@@ -309,7 +309,7 @@ public final class BatteryDiffEntryTest {
// Verifies the cache is updated into the new drawable. // Verifies the cache is updated into the new drawable.
final BatteryEntry.NameAndIcon nameAndIcon = final BatteryEntry.NameAndIcon nameAndIcon =
BatteryDiffEntry.sResourceCache.get(entry2.getKey()); BatteryDiffEntry.sResourceCache.get(entry2.getKey());
assertThat(nameAndIcon.icon).isEqualTo(mockDrawable2); assertThat(nameAndIcon.mIcon).isEqualTo(mockDrawable2);
} }
@Test @Test

20
tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
View File

@@ -158,8 +158,8 @@ public class BatteryEntryTest {
final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application,
BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY, 200, 100, 1000); BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY, 200, 100, 1000);
assertThat(entry.iconId).isEqualTo(R.drawable.ic_settings_aod); assertThat(entry.mIconId).isEqualTo(R.drawable.ic_settings_aod);
assertThat(entry.name).isEqualTo("Ambient display"); assertThat(entry.mName).isEqualTo("Ambient display");
} }
@Test @Test
@@ -167,8 +167,8 @@ public class BatteryEntryTest {
final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application,
BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + 42, "ABC", 200, 100); BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + 42, "ABC", 200, 100);
assertThat(entry.iconId).isEqualTo(R.drawable.ic_power_system); assertThat(entry.mIconId).isEqualTo(R.drawable.ic_power_system);
assertThat(entry.name).isEqualTo("ABC"); assertThat(entry.mName).isEqualTo("ABC");
} }
@Test @Test
@@ -261,16 +261,16 @@ public class BatteryEntryTest {
final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUserId( final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUserId(
mContext, userId); mContext, userId);
assertThat(nameAndIcon.name).isEqualTo(getString( assertThat(nameAndIcon.mName).isEqualTo(getString(
R.string.running_process_item_removed_user_label)); R.string.running_process_item_removed_user_label));
assertThat(nameAndIcon.icon).isNull(); assertThat(nameAndIcon.mIcon).isNull();
} }
@Test @Test
public void getNameAndIconFromUid_rerturnExpectedName() { public void getNameAndIconFromUid_rerturnExpectedName() {
final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUid( final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUid(
mContext, /* name */ null, /* uid */ 0); mContext, /* name */ null, /* uid */ 0);
assertThat(nameAndIcon.name).isEqualTo(getString(R.string.process_kernel_label)); assertThat(nameAndIcon.mName).isEqualTo(getString(R.string.process_kernel_label));
assertNameAndIcon("mediaserver", R.string.process_mediaserver_label); assertNameAndIcon("mediaserver", R.string.process_mediaserver_label);
assertNameAndIcon("dex2oat32", R.string.process_dex2oat_label); assertNameAndIcon("dex2oat32", R.string.process_dex2oat_label);
@@ -312,14 +312,14 @@ public class BatteryEntryTest {
private void assertNameAndIcon(String name, int stringId) { private void assertNameAndIcon(String name, int stringId) {
final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUid( final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromUid(
mContext, name, /* uid */ 1000); mContext, name, /* uid */ 1000);
assertThat(nameAndIcon.name).isEqualTo(getString(stringId)); assertThat(nameAndIcon.mName).isEqualTo(getString(stringId));
} }
private void assertNameAndIcon(int powerComponentId, int stringId, int iconId) { private void assertNameAndIcon(int powerComponentId, int stringId, int iconId) {
final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromPowerComponent( final NameAndIcon nameAndIcon = BatteryEntry.getNameAndIconFromPowerComponent(
mContext, powerComponentId); mContext, powerComponentId);
assertThat(nameAndIcon.name).isEqualTo(getString(stringId)); assertThat(nameAndIcon.mName).isEqualTo(getString(stringId));
assertThat(nameAndIcon.iconId).isEqualTo(iconId); assertThat(nameAndIcon.mIconId).isEqualTo(iconId);
} }
private String getString(int stringId) { private String getString(int stringId) {

4
tests/robotests/src/com/android/settings/fuelgauge/BatteryHistEntryTest.java
View File

@@ -57,7 +57,7 @@ public final class BatteryHistEntryTest {
when(mockBatteryEntry.isHidden()).thenReturn(true); when(mockBatteryEntry.isHidden()).thenReturn(true);
when(mBatteryUsageStats.getConsumedPower()).thenReturn(5.1); when(mBatteryUsageStats.getConsumedPower()).thenReturn(5.1);
when(mockBatteryEntry.getConsumedPower()).thenReturn(1.1); when(mockBatteryEntry.getConsumedPower()).thenReturn(1.1);
mockBatteryEntry.percent = 0.3; mockBatteryEntry.mPercent = 0.3;
when(mockBatteryEntry.getTimeInForegroundMs()).thenReturn(1234L); when(mockBatteryEntry.getTimeInForegroundMs()).thenReturn(1234L);
when(mockBatteryEntry.getTimeInBackgroundMs()).thenReturn(5689L); when(mockBatteryEntry.getTimeInBackgroundMs()).thenReturn(5689L);
when(mockBatteryEntry.getPowerComponentId()).thenReturn(expectedType); when(mockBatteryEntry.getPowerComponentId()).thenReturn(expectedType);
@@ -76,7 +76,7 @@ public final class BatteryHistEntryTest {
assertBatteryHistEntry( assertBatteryHistEntry(
new BatteryHistEntry(values), new BatteryHistEntry(values),
/*drainType=*/ expectedType, /*drainType=*/ expectedType,
/*percentOfTotal=*/ mockBatteryEntry.percent); /*percentOfTotal=*/ mockBatteryEntry.mPercent);
} }
@Test @Test

2
tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
View File

@@ -77,7 +77,7 @@ public final class ConvertUtilsTest {
when(mockBatteryEntry.isHidden()).thenReturn(true); when(mockBatteryEntry.isHidden()).thenReturn(true);
when(mBatteryUsageStats.getConsumedPower()).thenReturn(5.1); when(mBatteryUsageStats.getConsumedPower()).thenReturn(5.1);
when(mockBatteryEntry.getConsumedPower()).thenReturn(1.1); when(mockBatteryEntry.getConsumedPower()).thenReturn(1.1);
mockBatteryEntry.percent = 0.3; mockBatteryEntry.mPercent = 0.3;
when(mockBatteryEntry.getTimeInForegroundMs()).thenReturn(1234L); when(mockBatteryEntry.getTimeInForegroundMs()).thenReturn(1234L);
when(mockBatteryEntry.getTimeInBackgroundMs()).thenReturn(5689L); when(mockBatteryEntry.getTimeInBackgroundMs()).thenReturn(5689L);
when(mockBatteryEntry.getPowerComponentId()).thenReturn(expectedType); when(mockBatteryEntry.getPowerComponentId()).thenReturn(expectedType);