Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

Browse Source 
* commit '85c7b209c3babea164f5bec13352e7f5f262ea58':
  Fix style resolution for styles with '.' [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-07-18 21:45:20 +00:00
committed by Android Git Automerger
parent c3a7763b84 85c7b209c3
commit a3d2c7e72b
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
View File

@@ -613,19 +613,16 @@ public final class BridgeContext extends Context {
} }
if (value != null) { if (value != null) {
if ((value.getFirst() == ResourceType.STYLE) if (value.getFirst() == ResourceType.STYLE) {
|| (value.getFirst() == ResourceType.ATTR)) { // look for the style in all resources:
// look for the style in the current theme, and its parent: StyleResourceValue item = mRenderResources.getStyle(value.getSecond(),
ResourceValue item = mRenderResources.findItemInTheme(value.getSecond(),
isFrameworkRes); isFrameworkRes);
if (item != null) { if (item != null) {
if (item instanceof StyleResourceValue) { if (defaultPropMap != null) {
if (defaultPropMap != null) { defaultPropMap.put("style", item.getName());
defaultPropMap.put("style", item.getName());
}
defStyleValues = (StyleResourceValue)item;
} }
defStyleValues = item;
} else { } else {
Bridge.getLog().error(null, Bridge.getLog().error(null,
String.format( String.format(