am af23500c: Should be getting launcher icon DPI from ActivityManager.

* commit 'af23500cf9eb9c05ae0b2a0ea63c96534e648004':
  Should be getting launcher icon DPI from ActivityManager.
This commit is contained in:
Winson Chung 2012-02-13 12:38:38 -08:00 committed by Android Git Automerger
commit 94a1af88fb
1 changed files with 5 additions and 11 deletions

View File

@ -16,7 +16,9 @@
package com.android.launcher2; package com.android.launcher2;
import android.app.ActivityManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
@ -24,7 +26,6 @@ import android.content.res.Resources;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.util.DisplayMetrics;
import java.util.HashMap; import java.util.HashMap;
@ -53,16 +54,9 @@ public class IconCache {
mPackageManager = context.getPackageManager(); mPackageManager = context.getPackageManager();
int density = context.getResources().getDisplayMetrics().densityDpi; int density = context.getResources().getDisplayMetrics().densityDpi;
if (LauncherApplication.isScreenLarge()) { if (LauncherApplication.isScreenLarge()) {
if (density == DisplayMetrics.DENSITY_LOW) { ActivityManager activityManager =
mIconDpi = DisplayMetrics.DENSITY_MEDIUM; (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
} else if (density == DisplayMetrics.DENSITY_MEDIUM) { mIconDpi = activityManager.getLauncherLargeIconDensity();
mIconDpi = DisplayMetrics.DENSITY_HIGH;
} else if (density == DisplayMetrics.DENSITY_HIGH) {
mIconDpi = DisplayMetrics.DENSITY_XHIGH;
} else if (density == DisplayMetrics.DENSITY_XHIGH) {
// We'll need to use a denser icon, or some sort of a mipmap
mIconDpi = DisplayMetrics.DENSITY_XHIGH;
}
} else { } else {
mIconDpi = context.getResources().getDisplayMetrics().densityDpi; mIconDpi = context.getResources().getDisplayMetrics().densityDpi;
} }