summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-19 20:28:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-07-19 20:28:49 -0700
commit469b4c67adc77a87eb2c9ed9217edf1778002828 (patch)
treef6ca01c85c85a27ecd6f54ae1193f30e1cc67501 /include
parentb933dc7f47ec9a9609d0775fc469849f066bfcd7 (diff)
parentaad0fcc9619eb72c18a6afff48ebc9d4011f0f54 (diff)
downloadframeworks_base-469b4c67adc77a87eb2c9ed9217edf1778002828.zip
frameworks_base-469b4c67adc77a87eb2c9ed9217edf1778002828.tar.gz
frameworks_base-469b4c67adc77a87eb2c9ed9217edf1778002828.tar.bz2
am aad0fcc9: Merge change 7783 into donut
Merge commit 'aad0fcc9619eb72c18a6afff48ebc9d4011f0f54' * commit 'aad0fcc9619eb72c18a6afff48ebc9d4011f0f54': Add "nodpi" density, and expose a bunch of density-related APIs.
Diffstat (limited to 'include')
-rw-r--r--include/utils/ResourceTypes.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h
index 93bca4a..3819335 100644
--- a/include/utils/ResourceTypes.h
+++ b/include/utils/ResourceTypes.h
@@ -825,7 +825,8 @@ struct ResTable_config
};
enum {
- DENSITY_ANY = 0
+ DENSITY_DEFAULT = 0,
+ DENSITY_NONE = 0xffff
};
union {