Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use ResolveInfo for label and icon for LauncherActivityInfo"

Browse Source
This commit is contained in:
Amith Yamasani
2015-02-04 18:46:53 +00:00
committed by Android (Google) Code Review
parent ab6b238d62 7e19f5016f
commit 281dfe7fd2
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/java/android/content/pm/LauncherActivityInfo.java
View File

@@ -39,6 +39,7 @@ public class LauncherActivityInfo {
private ActivityInfo mActivityInfo;
private ComponentName mComponentName;
private ResolveInfo mResolveInfo;
private UserHandle mUser;
private long mFirstInstallTime;
@@ -52,6 +53,7 @@ public class LauncherActivityInfo {
LauncherActivityInfo(Context context, ResolveInfo info, UserHandle user,
long firstInstallTime) {
this(context);
mResolveInfo = info;
mActivityInfo = info.activityInfo;
mComponentName = LauncherApps.getComponentName(info);
mUser = user;
@@ -92,7 +94,7 @@ public class LauncherActivityInfo {
* @return The label for the activity.
*/
public CharSequence getLabel() {
return mActivityInfo.loadLabel(mPm);
return mResolveInfo.loadLabel(mPm);
}
/**
@@ -104,8 +106,22 @@ public class LauncherActivityInfo {
* @return The drawable associated with the activity
*/
public Drawable getIcon(int density) {
// TODO: Use density
return mActivityInfo.loadIcon(mPm);
int iconRes = mResolveInfo.getIconResource();
Resources resources = null;
Drawable icon = null;
// Get the preferred density icon from the app's resources
if (density != 0 && iconRes != 0) {
try {
resources = mPm.getResourcesForApplication(mActivityInfo.applicationInfo);
icon = resources.getDrawableForDensity(iconRes, density);
} catch (NameNotFoundException | Resources.NotFoundException exc) {
}
}
// Get the default density icon
if (icon == null) {
icon = mResolveInfo.loadIcon(mPm);
}
return icon;
}
/**
@@ -151,23 +167,7 @@ public class LauncherActivityInfo {
* @return A badged icon for the activity.
*/
public Drawable getBadgedIcon(int density) {
int iconRes = mActivityInfo.getIconResource();
Resources resources = null;
Drawable originalIcon = null;
try {
resources = mPm.getResourcesForApplication(mActivityInfo.applicationInfo);
try {
if (density != 0) {
originalIcon = resources.getDrawableForDensity(iconRes, density);
}
} catch (Resources.NotFoundException e) {
}
} catch (NameNotFoundException nnfe) {
}
if (originalIcon == null) {
originalIcon = mActivityInfo.loadIcon(mPm);
}
Drawable originalIcon = getIcon(density);
if (originalIcon instanceof BitmapDrawable) {
return mPm.getUserBadgedIcon(originalIcon, mUser);