diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-02 16:44:52 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-06-02 16:44:52 -0700 |
| commit | 8a7d44e8248cf7078da6094068b039dacc0a3971 (patch) | |
| tree | dbb6847bc8af2033321069e3ff1a2e0506f0ba14 | |
| parent | 0e5e16a656b0002f377f1bcda2e43a97206e4046 (diff) | |
| parent | 54cb63e26e41b80c013b8665878b9c7c7fb328c1 (diff) | |
| download | frameworks_base-8a7d44e8248cf7078da6094068b039dacc0a3971.zip frameworks_base-8a7d44e8248cf7078da6094068b039dacc0a3971.tar.gz frameworks_base-8a7d44e8248cf7078da6094068b039dacc0a3971.tar.bz2 | |
resolved conflicts for merge of 54cb63e2 to master
Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
| -rw-r--r-- | core/java/android/util/DisplayMetrics.java | 9 | ||||
| -rw-r--r-- | include/utils/ResourceTypes.h | 1 | ||||
| -rw-r--r-- | native/include/android/configuration.h | 1 | ||||
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 5 |
4 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java index 60a4ef2..d594567 100644 --- a/core/java/android/util/DisplayMetrics.java +++ b/core/java/android/util/DisplayMetrics.java @@ -38,6 +38,15 @@ public class DisplayMetrics { public static final int DENSITY_MEDIUM = 160; /** + * Standard quantized DPI for 720p TV screens. Applications should + * generally not worry about this density, instead targeting + * {@link #DENSITY_XHIGH} for 1080p TV screens. For situations where + * output is needed for a 720p screen, the UI elements can be scaled + * automatically by the platform. + */ + public static final int DENSITY_TV = 213; + + /** * Standard quantized DPI for high-density screens. */ public static final int DENSITY_HIGH = 240; diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index 7d3fc06..8a92cd6 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -841,6 +841,7 @@ struct ResTable_config DENSITY_DEFAULT = ACONFIGURATION_DENSITY_DEFAULT, DENSITY_LOW = ACONFIGURATION_DENSITY_LOW, DENSITY_MEDIUM = ACONFIGURATION_DENSITY_MEDIUM, + DENSITY_TV = ACONFIGURATION_DENSITY_TV, DENSITY_HIGH = ACONFIGURATION_DENSITY_HIGH, DENSITY_NONE = ACONFIGURATION_DENSITY_NONE }; diff --git a/native/include/android/configuration.h b/native/include/android/configuration.h index 39fef21..2444c4b 100644 --- a/native/include/android/configuration.h +++ b/native/include/android/configuration.h @@ -40,6 +40,7 @@ enum { ACONFIGURATION_DENSITY_DEFAULT = 0, ACONFIGURATION_DENSITY_LOW = 120, ACONFIGURATION_DENSITY_MEDIUM = 160, + ACONFIGURATION_DENSITY_TV = 213, ACONFIGURATION_DENSITY_HIGH = 240, ACONFIGURATION_DENSITY_NONE = 0xffff, diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 4894196..29d2b87 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -969,6 +969,11 @@ bool AaptGroupEntry::getDensityName(const char* name, return true; } + if (strcmp(name, "tvdpi") == 0) { + if (out) out->density = ResTable_config::DENSITY_TV; + return true; + } + if (strcmp(name, "hdpi") == 0) { if (out) out->density = ResTable_config::DENSITY_HIGH; return true; |