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 /core/java/android/content/res | |
| 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 'core/java/android/content/res')
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 3 | ||||
| -rw-r--r-- | core/java/android/content/res/TypedArray.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 5c7b01f..8ebe093 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -637,12 +637,13 @@ public final class AssetManager { * mRetData. */ private native final int loadResourceBagValue(int ident, int bagEntryId, TypedValue outValue, boolean resolve); - /*package*/ static final int STYLE_NUM_ENTRIES = 5; + /*package*/ static final int STYLE_NUM_ENTRIES = 6; /*package*/ static final int STYLE_TYPE = 0; /*package*/ static final int STYLE_DATA = 1; /*package*/ static final int STYLE_ASSET_COOKIE = 2; /*package*/ static final int STYLE_RESOURCE_ID = 3; /*package*/ static final int STYLE_CHANGING_CONFIGURATIONS = 4; + /*package*/ static final int STYLE_DENSITY = 5; /*package*/ native static final boolean applyStyle(int theme, int defStyleAttr, int defStyleRes, int xmlParser, int[] inAttrs, int[] outValues, int[] outIndices); diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java index 3a32c03..016ee7f 100644 --- a/core/java/android/content/res/TypedArray.java +++ b/core/java/android/content/res/TypedArray.java @@ -654,6 +654,7 @@ public class TypedArray { outValue.assetCookie = data[index+AssetManager.STYLE_ASSET_COOKIE]; outValue.resourceId = data[index+AssetManager.STYLE_RESOURCE_ID]; outValue.changingConfigurations = data[index+AssetManager.STYLE_CHANGING_CONFIGURATIONS]; + outValue.density = data[index+AssetManager.STYLE_DENSITY]; if (type == TypedValue.TYPE_STRING) { outValue.string = loadStringValueAt(index); } |