commit a6f32d7ff19319c5ed61d113672f112a6f54c938
author Deepanshu Gupta <deepanshu@google.com> Thu Sep 04 04:46:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 04 04:46:28 2014 +0000
tree d0ca6215571e02ecb3304036609b2438d63c1440
parent 2cb287f9cc79b0cd9e8ea37adf4b3411253eb244
parent 64d4ef8cf2f9ec6b7af6795fa9feb18cc07ba3d9

am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

* commit '64d4ef8cf2f9ec6b7af6795fa9feb18cc07ba3d9':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

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 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 @@
         // 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;
             }
         }