diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-19 20:28:49 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-19 20:28:49 -0700 |
commit | 89fbf845390322eb486632bae9108191803d4b9e (patch) | |
tree | 2e64185b7d2fb3c7a1e71b59daf5dfab92a28dde /include | |
parent | 9d4f889870310bd5399d895867a6bc52c4bdbd49 (diff) | |
parent | 64feb0889aac117a7f0ff397ba2088cf2b0e7901 (diff) | |
download | frameworks_native-89fbf845390322eb486632bae9108191803d4b9e.zip frameworks_native-89fbf845390322eb486632bae9108191803d4b9e.tar.gz frameworks_native-89fbf845390322eb486632bae9108191803d4b9e.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.h | 3 |
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 { |