diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-09-04 01:50:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-04 01:50:46 +0000 |
| commit | edc8b8579ba9f47bbca0ac0c2f0eb11d0eadab09 (patch) | |
| tree | c7f96d8a19270b773c8bc3976fee8430893d404c | |
| parent | f0336eb87d32414eb14865044be41ea590e7a6ac (diff) | |
| parent | c39afe45d48db5522986f615889edd552660ab4a (diff) | |
| download | frameworks_base-edc8b8579ba9f47bbca0ac0c2f0eb11d0eadab09.zip frameworks_base-edc8b8579ba9f47bbca0ac0c2f0eb11d0eadab09.tar.gz frameworks_base-edc8b8579ba9f47bbca0ac0c2f0eb11d0eadab09.tar.bz2 | |
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
| -rw-r--r-- | tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java index cbc199a..48294d1 100644 --- a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java +++ b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java @@ -91,7 +91,7 @@ public final class BridgeTypedArray extends TypedArray { // first count the array size int count = 0; for (ResourceValue data : mResourceData) { - if (data != null) { + if (data != null && !RenderResources.REFERENCE_NULL.equals(data.getValue())) { count++; } } @@ -103,7 +103,8 @@ public final class BridgeTypedArray extends TypedArray { // fill the array with the indices. int index = 1; for (int i = 0 ; i < mResourceData.length ; i++) { - if (mResourceData[i] != null) { + if (mResourceData[i] != null + && !RenderResources.REFERENCE_NULL.equals(mResourceData[i].getValue())) { mIndices[index++] = i; } } |