Merge "LayoutLib: move asserts around." into honeycomb

This commit is contained in:
Xavier Ducrohet
2011-01-10 17:44:16 -08:00
committed by Android (Google) Code Review

View File

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