Skip to content
Snippets Groups Projects
Commit 610341b3 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles...

am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '95bbeb96':
  Fix style resolution for styles with '.' [DO NOT MERGE]
parents 696eb4da 95bbeb96
No related merge requests found
......@@ -613,19 +613,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(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment