diff options
author | Winson Chung <winsonc@google.com> | 2012-01-24 14:59:06 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-24 14:59:06 -0800 |
commit | ced37c68e08e57da6626712cefc62bd7515072a0 (patch) | |
tree | f03d7281f024c87d8b21dbe79cf7b43b7bdd6ac9 | |
parent | d7654c416c215dd6a9c8b733a16b0a35f1f22c13 (diff) | |
parent | 8429d507570be5c55ecb66fc578e496e310b9f28 (diff) | |
download | android_packages_apps_Trebuchet-ced37c68e08e57da6626712cefc62bd7515072a0.tar.gz android_packages_apps_Trebuchet-ced37c68e08e57da6626712cefc62bd7515072a0.tar.bz2 android_packages_apps_Trebuchet-ced37c68e08e57da6626712cefc62bd7515072a0.zip |
Merge "Should be getting launcher icon DPI from ActivityManager."
-rw-r--r-- | src/com/android/launcher2/IconCache.java | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java index 2430a6b33..4d38cc9a3 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; } |