diff options
author | Winson Chung <winsonc@google.com> | 2012-02-13 14:27:42 -0800 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2012-02-13 14:29:05 -0800 |
commit | d83f5f4db328fbd152491bbf9fa13abc94bd6f25 (patch) | |
tree | a897860d42671aece8d0b9c3a9d9da81d0238328 | |
parent | 08fc2344a46f6f42442a750048c4171839b02fe2 (diff) | |
download | android_packages_apps_Trebuchet-d83f5f4db328fbd152491bbf9fa13abc94bd6f25.tar.gz android_packages_apps_Trebuchet-d83f5f4db328fbd152491bbf9fa13abc94bd6f25.tar.bz2 android_packages_apps_Trebuchet-d83f5f4db328fbd152491bbf9fa13abc94bd6f25.zip |
Reverting: Change I3a8849a5: Cleaning up extra line related to icon density change.
Change-Id: I5e8106d0f77545b80a0b21d4230cf826439ac371
-rw-r--r-- | src/com/android/launcher2/IconCache.java | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java index 4caada3e6..1e8379d3c 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; @@ -49,22 +50,13 @@ public class IconCache { private int mIconDpi; public IconCache(LauncherApplication context) { + ActivityManager activityManager = + (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); + mContext = context; mPackageManager = context.getPackageManager(); - 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; - } - } else { - mIconDpi = context.getResources().getDisplayMetrics().densityDpi; - } + mIconDpi = activityManager.getLauncherLargeIconDensity(); + // need to set mIconDpi before getting default icon mDefaultIcon = makeDefaultIcon(); } |