drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2014-09-04 01:50:05 +00:00
committed by Android (Google) Code Review
parent 0511ba506d e2370f092f
commit 47a400131f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
View File

@ -91,7 +91,7 @@ public final class BridgeTypedArray extends TypedArray {
// first count the array size // first count the array size
int count = 0; int count = 0;
for (ResourceValue data : mResourceData) { for (ResourceValue data : mResourceData) {
if (data != null) { if (data != null && !RenderResources.REFERENCE_NULL.equals(data.getValue())) {
count++; count++;
} }
} }
@ -103,7 +103,8 @@ public final class BridgeTypedArray extends TypedArray {
// fill the array with the indices. // fill the array with the indices.
int index = 1; int index = 1;
for (int i = 0 ; i < mResourceData.length ; i++) { 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; mIndices[index++] = i;
} }
} }