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

am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 automerge: 7d3d5fe

Browse Source 
automerge: 1f33b2f

* commit '1f33b2f6f61f66b751d6ecb2660bed8f36c91986':
  Fix setting styles in custom views.
This commit is contained in:
Deepanshu Gupta
2014-11-10 23:57:27 +00:00
committed by android-build-merger
parent 7cc11f8bf3 1f33b2f6f6
commit fb5877a4e7
1 changed files with 17 additions and 0 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

@@ -478,6 +478,23 @@ public final class BridgeContext extends Context {
// get the StyleResourceValue based on the resId;
StyleResourceValue style = getStyleByDynamicId(resid);
if (style == null) {
// In some cases, style may not be a dynamic id, so we do a full search.
ResourceReference ref = resolveId(resid);
if (ref != null) {
if (ref.isFramework()) {
ref =
getRenderResources().getFrameworkResource(ResourceType.STYLE, ref.getName());
} else {
ref =
getRenderResources().getProjectResource(ResourceType.STYLE, ref.getName());
}
if (ref instanceof StyleResourceValue) {
style = ((StyleResourceValue) ref);
}
}
}
if (style == null) {
throw new Resources.NotFoundException();
}