diff options
author | Xavier Ducrohet <xav@android.com> | 2011-01-10 11:57:49 -0800 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2011-01-10 11:57:49 -0800 |
commit | 419e8296ea76c5f1db1abbaa88b39b538fa42403 (patch) | |
tree | 45de664a4397d600b3ba39434cdaa3b2bab57328 /tools | |
parent | 5c6b786e1c1a103fe3f80b294ac166da1555fffa (diff) | |
download | frameworks_base-419e8296ea76c5f1db1abbaa88b39b538fa42403.zip frameworks_base-419e8296ea76c5f1db1abbaa88b39b538fa42403.tar.gz frameworks_base-419e8296ea76c5f1db1abbaa88b39b538fa42403.tar.bz2 |
LayoutLib: move asserts around.
Change-Id: I6fcfcf2e6fad1d9fa172b9a8c20c72fa2533e7fa
Diffstat (limited to 'tools')
-rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java index 886ef2a..4fb280d 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java @@ -328,11 +328,12 @@ public final class BridgeTypedArray extends TypedArray { } // looks like were unable to resolve the color value. - assert false; Bridge.getLog().warning(null, String.format( "Unable to resolve color value \"%1$s\" in attribute \"%2$s\"", value, mNames[index])); + assert false; + return null; } @@ -406,11 +407,12 @@ public final class BridgeTypedArray extends TypedArray { } // looks like we were unable to resolve the dimension value - assert false; Bridge.getLog().warning(null, String.format( "Unable to resolve dimension value \"%1$s\" in attribute \"%2$s\"", s, mNames[index])); + assert false; + return defValue; } @@ -536,11 +538,12 @@ public final class BridgeTypedArray extends TypedArray { } // looks like we were unable to resolve the fraction value - assert false; Bridge.getLog().warning(null, String.format( "Unable to resolve fraction value \"%1$s\" in attribute \"%2$s\"", value, mNames[index])); + assert false; + return defValue; } @@ -644,9 +647,11 @@ public final class BridgeTypedArray extends TypedArray { return idValue.intValue(); } - assert false; Bridge.getLog().warning(null, String.format( "Unable to resolve id \"%1$s\" for attribute \"%2$s\"", value, mNames[index])); + + assert false; + return defValue; } @@ -679,11 +684,12 @@ public final class BridgeTypedArray extends TypedArray { } // looks like we were unable to resolve the drawable - assert false; Bridge.getLog().warning(null, String.format( "Unable to resolve drawable \"%1$s\" in attribute \"%2$s\"", stringValue, mNames[index])); + assert false; + return null; } |