commit 364cd1090924f821ffddf8a0c7e6f1c80c95ffb0
author Charlie Tsai <chartsai@google.com> Tue Apr 04 13:24:46 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 04 13:24:50 2017 +0000
tree b19ff9ee4583cd152b9be2944d7225c2ee69a930
parent 1163568d7c5f0cdbfd9e0a9b93ed5209bc2614bd
parent f7fe5a7ff8768e8d52910270aef2aaacd7dc5a91

Merge "Fixed Intent parsing error of PreferenceScreen"

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 cda8e6a..34360e7 100644
--- a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
+++ b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
@@ -772,8 +772,20 @@
      */
     @Override
     public boolean getValue(int index, TypedValue outValue) {
-        String s = getString(index);
-        return s != null && ResourceHelper.parseFloatAttribute(mNames[index], s, outValue, false);
+        // TODO: more switch cases for other types.
+        outValue.type = getType(index);
+        switch (outValue.type) {
+            case TYPE_NULL:
+                return false;
+            case TYPE_STRING:
+                outValue.string = getString(index);
+                return true;
+            default:
+                // For back-compatibility, parse as float.
+                String s = getString(index);
+                return s != null &&
+                        ResourceHelper.parseFloatAttribute(mNames[index], s, outValue, false);
+        }
     }
 
     @Override