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

Make icon in Anomaly detail page have badge.

Browse Source 
Anomaly detail page is using the correct API but wrong parameters.
This cl fix it by specifying the correct userId.

Bug: 38306392
Test: RunSettingsRoboTests

Change-Id: If593bf8a7881a9eecbaa62858492878235d88397
This commit is contained in:
jackqdyulei
2017-06-20 13:17:05 -07:00
parent aad82fa4ee
commit 23f388076d
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
View File

@@ -59,6 +59,7 @@ public class PowerUsageAnomalyDetails extends DashboardFragment implements
PackageManager mPackageManager;
@VisibleForTesting
BatteryUtils mBatteryUtils;
@VisibleForTesting
IconDrawableFactory mIconDrawableFactory;
public static void startBatteryAbnormalPage(SettingsActivity caller,
@@ -79,7 +80,7 @@ public class PowerUsageAnomalyDetails extends DashboardFragment implements
mAnomalies = getArguments().getParcelableArrayList(EXTRA_ANOMALY_LIST);
mAbnormalListGroup = (PreferenceGroup) findPreference(KEY_PREF_ANOMALY_LIST);
mPackageManager = context.getPackageManager();
mIconDrawableFactory = IconDrawableFactory.newInstance(context, false /* EmbedShadow */);
mIconDrawableFactory = IconDrawableFactory.newInstance(context);
mBatteryUtils = BatteryUtils.getInstance(context);
}
@@ -134,7 +135,7 @@ public class PowerUsageAnomalyDetails extends DashboardFragment implements
final Anomaly anomaly = mAnomalies.get(i);
Preference pref = new AnomalyPreference(getPrefContext(), anomaly);
pref.setSummary(mBatteryUtils.getSummaryResIdFromAnomalyType(anomaly.type));
Drawable icon = getIconFromPackageName(anomaly.packageName);
Drawable icon = getBadgedIcon(anomaly.packageName, UserHandle.getUserId(anomaly.uid));
if (icon != null) {
pref.setIcon(icon);
}
@@ -149,11 +150,12 @@ public class PowerUsageAnomalyDetails extends DashboardFragment implements
refreshUi();
}
Drawable getIconFromPackageName(String packageName) {
@VisibleForTesting
Drawable getBadgedIcon(String packageName, int userId) {
try {
final ApplicationInfo appInfo = mPackageManager.getApplicationInfo(packageName,
PackageManager.GET_META_DATA);
return mIconDrawableFactory.getBadgedIcon(appInfo);
return mIconDrawableFactory.getBadgedIcon(appInfo, userId);
} catch (PackageManager.NameNotFoundException e) {
return mPackageManager.getDefaultActivityIcon();
}