commit 486ed3da0a86e697ab018d25188fc5ccd60b4d35
author Deepanshu Gupta <deepanshu@google.com> Wed Aug 20 00:19:03 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 19 02:43:23 2014 +0000
tree 8cfe7a848230096ba2ffc2ae880f28b9090dbea1
parent 92973b8f37769c231c02e9a66fb96b555bd3e3d5
parent 151b68ddc222d66b60b5447a60ab6e246a4d2ac0

Merge "Fix "@null" resource values in LayoutLib." into lmp-dev

tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java

diff --git a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
index f939678..5b69681 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 @@
         // 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 @@
         // 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;
             }
         }