diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 15:38:40 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 15:38:40 -0700 |
| commit | e1861133d51b9e6a6f658eb366630ad4f4d3ff8f (patch) | |
| tree | 046aaac6d455ccd57d38f3a13df44ecd13ac0322 /tools | |
| parent | d91450e1169b3a57b3507fe86d947de05549f4ed (diff) | |
| parent | 3f2fd987b230740e1b28ccb541d1181cb2187ae6 (diff) | |
| download | frameworks_base-e1861133d51b9e6a6f658eb366630ad4f4d3ff8f.zip frameworks_base-e1861133d51b9e6a6f658eb366630ad4f4d3ff8f.tar.gz frameworks_base-e1861133d51b9e6a6f658eb366630ad4f4d3ff8f.tar.bz2 | |
Merge commit 'korg/cupcake'
Conflicts:
core/java/android/webkit/WebView.java
core/java/android/widget/TwoLineListItem.java
preloaded-classes
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java index f5da91d..48998db 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java @@ -690,14 +690,15 @@ public final class BridgeTypedArray extends TypedArray { } String value = mData[index].getValue(); - if (value == null) { - return null; + if (value != null) { + return new CharSequence[] { value }; } - throw new UnsupportedOperationException( - String.format("BridgeTypedArray: UNKNOWN VALUE FOR getTextArray(%d) => %s", //DEBUG - index, value)); + mContext.getLogger().warning(String.format( + String.format("Unknown value for getTextArray(%d) => %s", //DEBUG + index, mData[index].getName()))); + return null; } /** |