diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-30 16:05:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-30 16:05:27 -0700 |
| commit | afcf686cb070313ae5ce6c54ac381a3a86a60ed2 (patch) | |
| tree | 4a7c1fa186ad4b1a7d37ea4d97aa0b0411b50d85 /include | |
| parent | 8845ea0592e3bffc726febb66de48646b0398e70 (diff) | |
| parent | 25dff70f153529b87f5ad4a92f4de21e8950b1de (diff) | |
| download | frameworks_base-afcf686cb070313ae5ce6c54ac381a3a86a60ed2.zip frameworks_base-afcf686cb070313ae5ce6c54ac381a3a86a60ed2.tar.gz frameworks_base-afcf686cb070313ae5ce6c54ac381a3a86a60ed2.tar.bz2 | |
am 25dff70f: Merge change 9039 into donut
Merge commit '25dff70f153529b87f5ad4a92f4de21e8950b1de'
* commit '25dff70f153529b87f5ad4a92f4de21e8950b1de':
Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/ResourceTypes.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index edd0cae..e524e2a 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -1655,7 +1655,8 @@ public: ssize_t resolveReference(Res_value* inOutValue, ssize_t blockIndex, uint32_t* outLastRef = NULL, - uint32_t* inoutTypeSpecFlags = NULL) const; + uint32_t* inoutTypeSpecFlags = NULL, + ResTable_config* outConfig = NULL) const; enum { TMP_BUFFER_SIZE = 16 @@ -1729,7 +1730,8 @@ public: */ ssize_t resolveAttributeReference(Res_value* inOutValue, ssize_t blockIndex, uint32_t* outLastRef = NULL, - uint32_t* inoutTypeSpecFlags = NULL) const; + uint32_t* inoutTypeSpecFlags = NULL, + ResTable_config* inoutConfig = NULL) const; void dumpToLog() const; |