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

Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2014-10-02 03:26:48 +00:00
committed by Android (Google) Code Review
parent 5793383457 409bd3d774
commit 76aff1f6ab
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -598,8 +598,7 @@ public final class BridgeContext extends Context {
if (item != null) { if (item != null) {
// item is a reference to a style entry. Search for it. // item is a reference to a style entry. Search for it.
item = mRenderResources.findResValue(item.getValue(), item = mRenderResources.findResValue(item.getValue(), item.isFramework());
false /*forceFrameworkOnly*/);
if (item instanceof StyleResourceValue) { if (item instanceof StyleResourceValue) {
defStyleValues = (StyleResourceValue)item; defStyleValues = (StyleResourceValue)item;