drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2014-07-18 21:33:46 +00:00
committed by Android (Google) Code Review
parent 357ebfc5e4 da28101757
commit d3ac01ff76
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.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(