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

am 662ec915: am 227d42db: Merge "Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon" into mnc-dev

Browse Source 
* commit '662ec9150bb45a96ac779675694ec0f7c47e98c2':
  Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon
This commit is contained in:
Ricky Wai
2015-05-12 09:59:11 +00:00
committed by Android Git Automerger
parent 0835c1f3e3 662ec9150b
commit e3cd0af378
2 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,20 +103,11 @@ public class LauncherActivityInfo {
* density DPI values from {@link DisplayMetrics}.
* @see #getBadgedIcon(int)
* @see DisplayMetrics
* @return The drawable associated with the activity
* @return The drawable associated with the activity.
*/
public Drawable getIcon(int density) {
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) {
}
}
final int iconRes = mResolveInfo.getIconResource();
Drawable icon = getDrawableForDensity(iconRes, density);
// Get the default density icon
if (icon == null) {
icon = mResolveInfo.loadIcon(mPm);
@@ -124,6 +115,46 @@ public class LauncherActivityInfo {
return icon;
}
/**
* Returns the icon for this activity, without any badging for the profile.
* This function can get the icon no matter the icon needs to be badged or not.
* @param density The preferred density of the icon, zero for default density. Use
* density DPI values from {@link DisplayMetrics}.
* @see #getBadgedIcon(int)
* @see DisplayMetrics
* @return The drawable associated with the activity.
*/
private Drawable getOriginalIcon(int density) {
final int iconRes = mResolveInfo.getIconResourceInternal();
Drawable icon = getDrawableForDensity(iconRes, density);
// Get the default density icon
if (icon == null) {
icon = mResolveInfo.loadIcon(mPm);
}
return icon;
}
/**
* Returns the drawable for this activity, without any badging for the profile.
* @param resource id of the drawable.
* @param density The preferred density of the icon, zero for default density. Use
* density DPI values from {@link DisplayMetrics}.
* @see DisplayMetrics
* @return The drawable associated with the resource id.
*/
private Drawable getDrawableForDensity(int iconRes, int density) {
// Get the preferred density icon from the app's resources
if (density != 0 && iconRes != 0) {
try {
final Resources resources
= mPm.getResourcesForApplication(mActivityInfo.applicationInfo);
return resources.getDrawableForDensity(iconRes, density);
} catch (NameNotFoundException | Resources.NotFoundException exc) {
}
}
return null;
}
/**
* Returns the application flags from the ApplicationInfo of the activity.
*
@@ -167,7 +198,7 @@ public class LauncherActivityInfo {
* @return A badged icon for the activity.
*/
public Drawable getBadgedIcon(int density) {
Drawable originalIcon = getIcon(density);
Drawable originalIcon = getOriginalIcon(density);
if (originalIcon instanceof BitmapDrawable) {
return mPm.getUserBadgedIcon(originalIcon, mUser);

20
core/java/android/content/pm/ResolveInfo.java
View File

@@ -221,16 +221,16 @@ public class ResolveInfo implements Parcelable {
}
return ci.loadIcon(pm);
}
/**
* Return the icon resource identifier to use for this match. If the
* match defines an icon, that is used; else if the activity defines
* an icon, that is used; else, the application icon is used.
*
* This function does not check noResourceId flag.
*
* @return The icon associated with this match.
*/
public final int getIconResource() {
if (noResourceId) return 0;
final int getIconResourceInternal() {
if (icon != 0) return icon;
final ComponentInfo ci = getComponentInfo();
if (ci != null) {
@@ -239,6 +239,18 @@ public class ResolveInfo implements Parcelable {
return 0;
}
/**
* Return the icon resource identifier to use for this match. If the
* match defines an icon, that is used; else if the activity defines
* an icon, that is used; else, the application icon is used.
*
* @return The icon associated with this match.
*/
public final int getIconResource() {
if (noResourceId) return 0;
return getIconResourceInternal();
}
public void dump(Printer pw, String prefix) {
if (filter != null) {
pw.println(prefix + "Filter:");