From 8429d507570be5c55ecb66fc578e496e310b9f28 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 24 Jan 2012 14:46:24 -0800 Subject: [PATCH] Should be getting launcher icon DPI from ActivityManager. Change-Id: Iec1b375568b421220fdbf08de6e7a697d0488e24 --- src/com/android/launcher2/IconCache.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java index 2430a6b337..4d38cc9a3f 100644 --- a/src/com/android/launcher2/IconCache.java +++ b/src/com/android/launcher2/IconCache.java @@ -16,7 +16,9 @@ package com.android.launcher2; +import android.app.ActivityManager; import android.content.ComponentName; +import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; @@ -24,7 +26,6 @@ import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.util.DisplayMetrics; import java.util.HashMap; @@ -53,16 +54,9 @@ public class IconCache { mPackageManager = context.getPackageManager(); int density = context.getResources().getDisplayMetrics().densityDpi; if (LauncherApplication.isScreenLarge()) { - if (density == DisplayMetrics.DENSITY_LOW) { - mIconDpi = DisplayMetrics.DENSITY_MEDIUM; - } else if (density == DisplayMetrics.DENSITY_MEDIUM) { - 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; - } + ActivityManager activityManager = + (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); + mIconDpi = activityManager.getLauncherLargeIconDensity(); } else { mIconDpi = context.getResources().getDisplayMetrics().densityDpi; }