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

am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev

Browse Source 
automerge: ddc83df

* commit 'ddc83dfa8f17db1a8a566c8b92b0fea56dedd00a':
  Fix setTextAppearance for styles with dots.
This commit is contained in:
Deepanshu Gupta
2014-11-21 10:06:59 +00:00
committed by android-build-merger
parent 1150292dac ddc83dfa8f
commit 9ab79551ac
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -483,16 +483,7 @@ public final class BridgeContext extends Context {
// 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);
}
mRenderResources.getStyle(ref.getName(), ref.isFramework());
}
}