diff options
author | Winson Chung <winsonc@google.com> | 2012-02-13 12:38:38 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-13 12:38:38 -0800 |
commit | 94a1af88fb7f58162b05af70bec16f91eae983e4 (patch) | |
tree | 3be2c98f8c7353afd846b8fa74acaf52b0904481 | |
parent | a2319e198b98fec50020974be310ae873519fa54 (diff) | |
parent | af23500cf9eb9c05ae0b2a0ea63c96534e648004 (diff) | |
download | android_packages_apps_Trebuchet-94a1af88fb7f58162b05af70bec16f91eae983e4.tar.gz android_packages_apps_Trebuchet-94a1af88fb7f58162b05af70bec16f91eae983e4.tar.bz2 android_packages_apps_Trebuchet-94a1af88fb7f58162b05af70bec16f91eae983e4.zip |
am af23500c: Should be getting launcher icon DPI from ActivityManager.
* commit 'af23500cf9eb9c05ae0b2a0ea63c96534e648004':
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; } |