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

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

Browse Source 
* commit '76aff1f6ab84b8ac9f4a48ae7dff62ece00e1b97':
  Resource resolution bug fix. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-10-02 03:34:24 +00:00
committed by Android Git Automerger
parent d00d2ff207 76aff1f6ab
commit ae4cb17a14
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;