am 5af7324a
: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '5af7324ace4f318d7395b680beabec7a0f0e39b3': Fix style resolution for styles with '.' [DO NOT MERGE]
This commit is contained in:
@ -607,19 +607,16 @@ public final class BridgeContext extends Context {
|
||||
}
|
||||
|
||||
if (value != null) {
|
||||
if ((value.getFirst() == ResourceType.STYLE)
|
||||
|| (value.getFirst() == ResourceType.ATTR)) {
|
||||
// look for the style in the current theme, and its parent:
|
||||
ResourceValue item = mRenderResources.findItemInTheme(value.getSecond(),
|
||||
if (value.getFirst() == ResourceType.STYLE) {
|
||||
// look for the style in all resources:
|
||||
StyleResourceValue item = mRenderResources.getStyle(value.getSecond(),
|
||||
isFrameworkRes);
|
||||
if (item != null) {
|
||||
if (item instanceof StyleResourceValue) {
|
||||
if (defaultPropMap != null) {
|
||||
defaultPropMap.put("style", item.getName());
|
||||
}
|
||||
|
||||
defStyleValues = (StyleResourceValue)item;
|
||||
if (defaultPropMap != null) {
|
||||
defaultPropMap.put("style", item.getName());
|
||||
}
|
||||
|
||||
defStyleValues = item;
|
||||
} else {
|
||||
Bridge.getLog().error(null,
|
||||
String.format(
|
||||
|
Reference in New Issue
Block a user