Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ec63cd85: Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop

Browse Source 
* commit 'ec63cd85c8b7f90a39e04aeec560fea7ea973b9a':
  DO NOT MERGE Return 1.5 * density as default for large screens.
This commit is contained in:
Andrew Flynn
2012-02-23 18:45:52 -08:00
committed by Android Git Automerger
parent e2b98cf359 ec63cd85c8
commit 206be012b4
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/app/ActivityManager.java
View File

@@ -1442,9 +1442,10 @@ public class ActivityManager {
public int getLauncherLargeIconDensity() {
final Resources res = mContext.getResources();
final int density = res.getDisplayMetrics().densityDpi;
final int sw = res.getConfiguration().smallestScreenWidthDp;
if ((res.getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK)
!= Configuration.SCREENLAYOUT_SIZE_XLARGE) {
if (sw < 600) {
// Smaller than approx 7" tablets, use the regular icon size.
return density;
}
@@ -1458,7 +1459,9 @@ public class ActivityManager {
case DisplayMetrics.DENSITY_XHIGH:
return DisplayMetrics.DENSITY_MEDIUM * 2;
default:
return density;
// The density is some abnormal value. Return some other
// abnormal value that is a reasonable scaling of it.
return (int)(density*1.5f);
}
}
@@ -1471,9 +1474,10 @@ public class ActivityManager {
public int getLauncherLargeIconSize() {
final Resources res = mContext.getResources();
final int size = res.getDimensionPixelSize(android.R.dimen.app_icon_size);
final int sw = res.getConfiguration().smallestScreenWidthDp;
if ((res.getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK)
!= Configuration.SCREENLAYOUT_SIZE_XLARGE) {
if (sw < 600) {
// Smaller than approx 7" tablets, use the regular icon size.
return size;
}
@@ -1489,7 +1493,9 @@ public class ActivityManager {
case DisplayMetrics.DENSITY_XHIGH:
return (size * DisplayMetrics.DENSITY_MEDIUM * 2) / DisplayMetrics.DENSITY_XHIGH;
default:
return size;
// The density is some abnormal value. Return some other
// abnormal value that is a reasonable scaling of it.
return (int)(size*1.5f);
}
}