Merge "DO NOT MERGE" into ics-scoop (8046e294) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -21388,7 +21388,6 @@ package android.util {
		field public static final int DENSITY_MEDIUM = 160; // 0xa0
		field public static final int DENSITY_TV = 213; // 0xd5
		field public static final int DENSITY_XHIGH = 320; // 0x140
		field public static final int DENSITY_XXHIGH = 480; // 0x1e0
		field public float density;
		field public int densityDpi;
		field public int heightPixels;

core/java/android/app/ActivityManager.java

+8 −18

Original line number	Diff line number	Diff line
		@@ -1442,10 +1442,9 @@ public class ActivityManager {
		public int getLauncherLargeIconDensity() {
		final Resources res = mContext.getResources();
		final int density = res.getDisplayMetrics().densityDpi;
		final int sw = res.getConfiguration().smallestScreenWidthDp;

		if (sw < 600) {
		// Smaller than approx 7" tablets, use the regular icon size.
		if ((res.getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK)
		!= Configuration.SCREENLAYOUT_SIZE_XLARGE) {
		return density;
		}

		@@ -1457,13 +1456,9 @@ public class ActivityManager {
		case DisplayMetrics.DENSITY_HIGH:
		return DisplayMetrics.DENSITY_XHIGH;
		case DisplayMetrics.DENSITY_XHIGH:
		return DisplayMetrics.DENSITY_XXHIGH;
		case DisplayMetrics.DENSITY_XXHIGH:
		return DisplayMetrics.DENSITY_XHIGH * 2;
		return DisplayMetrics.DENSITY_MEDIUM * 2;
		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 density;
		}
		}

		@@ -1476,10 +1471,9 @@ 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 (sw < 600) {
		// Smaller than approx 7" tablets, use the regular icon size.
		if ((res.getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK)
		!= Configuration.SCREENLAYOUT_SIZE_XLARGE) {
		return size;
		}

		@@ -1493,13 +1487,9 @@ public class ActivityManager {
		case DisplayMetrics.DENSITY_HIGH:
		return (size * DisplayMetrics.DENSITY_XHIGH) / DisplayMetrics.DENSITY_HIGH;
		case DisplayMetrics.DENSITY_XHIGH:
		return (size * DisplayMetrics.DENSITY_XXHIGH) / DisplayMetrics.DENSITY_XHIGH;
		case DisplayMetrics.DENSITY_XXHIGH:
		return (size * DisplayMetrics.DENSITY_XHIGH*2) / DisplayMetrics.DENSITY_XXHIGH;
		return (size * DisplayMetrics.DENSITY_MEDIUM * 2) / DisplayMetrics.DENSITY_XHIGH;
		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 size;
		}
		}

core/java/android/util/DisplayMetrics.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -56,13 +56,6 @@ public class DisplayMetrics {
		*/
		public static final int DENSITY_XHIGH = 320;

		/**
		* Standard quantized DPI for extra-extra-high-density screens. Applications
		* should not generally worry about this density; relying on XHIGH graphics
		* being scaled up to it should be sufficient for almost all cases.
		*/
		public static final int DENSITY_XXHIGH = 480;

		/**
		* The reference density used throughout the system.
		*/

include/utils/ResourceTypes.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -843,8 +843,6 @@ struct ResTable_config
		DENSITY_MEDIUM = ACONFIGURATION_DENSITY_MEDIUM,
		DENSITY_TV = ACONFIGURATION_DENSITY_TV,
		DENSITY_HIGH = ACONFIGURATION_DENSITY_HIGH,
		DENSITY_XHIGH = ACONFIGURATION_DENSITY_XHIGH,
		DENSITY_XXHIGH = ACONFIGURATION_DENSITY_XXHIGH,
		DENSITY_NONE = ACONFIGURATION_DENSITY_NONE
		};

native/include/android/configuration.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -42,8 +42,6 @@ enum {
		ACONFIGURATION_DENSITY_MEDIUM = 160,
		ACONFIGURATION_DENSITY_TV = 213,
		ACONFIGURATION_DENSITY_HIGH = 240,
		ACONFIGURATION_DENSITY_XHIGH = 320,
		ACONFIGURATION_DENSITY_XXHIGH = 480,
		ACONFIGURATION_DENSITY_NONE = 0xffff,

		ACONFIGURATION_KEYBOARD_ANY = 0x0000,