From d0356a19c1630e598a096477ce5cb5d2942a9405 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 26 Apr 2012 19:03:12 -0700 Subject: [PATCH] Fix launcher icon size for tvdpi. We didn't have a case for tvdpi, so ended up in the default scaling. This resulting in us using 319 instead of 320. Fixed the default case to round, and added explicit cases for tvdpi since this is a standard density. Change-Id: I752b924e1556af94682428c8c0ed7c75d15ac4a4 --- core/java/android/app/ActivityManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 7dce2d3d99504..7746ca9aec238 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -1687,6 +1687,8 @@ public class ActivityManager { return DisplayMetrics.DENSITY_MEDIUM; case DisplayMetrics.DENSITY_MEDIUM: return DisplayMetrics.DENSITY_HIGH; + case DisplayMetrics.DENSITY_TV: + return DisplayMetrics.DENSITY_XHIGH; case DisplayMetrics.DENSITY_HIGH: return DisplayMetrics.DENSITY_XHIGH; case DisplayMetrics.DENSITY_XHIGH: @@ -1696,7 +1698,7 @@ public class ActivityManager { default: // The density is some abnormal value. Return some other // abnormal value that is a reasonable scaling of it. - return (int)(density*1.5f); + return (int)((density*1.5f)+.5f); } } @@ -1723,6 +1725,8 @@ public class ActivityManager { return (size * DisplayMetrics.DENSITY_MEDIUM) / DisplayMetrics.DENSITY_LOW; case DisplayMetrics.DENSITY_MEDIUM: return (size * DisplayMetrics.DENSITY_HIGH) / DisplayMetrics.DENSITY_MEDIUM; + case DisplayMetrics.DENSITY_TV: + return (size * DisplayMetrics.DENSITY_XHIGH) / DisplayMetrics.DENSITY_HIGH; case DisplayMetrics.DENSITY_HIGH: return (size * DisplayMetrics.DENSITY_XHIGH) / DisplayMetrics.DENSITY_HIGH; case DisplayMetrics.DENSITY_XHIGH: @@ -1732,7 +1736,7 @@ public class ActivityManager { default: // The density is some abnormal value. Return some other // abnormal value that is a reasonable scaling of it. - return (int)(size*1.5f); + return (int)((size*1.5f) + .5f); } }