commit ddc83dfa8f17db1a8a566c8b92b0fea56dedd00a
author Deepanshu Gupta <deepanshu@google.com> Wed Nov 19 23:00:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 19 23:00:43 2014 +0000
tree 226ecd2b8f88b81c005c24c30d5aa70f9fc0c2e8
parent a0bc2e7e3c2f075a23449df00659c96d0cddb417
parent 4104abf875e16ad54c248ce602e573d2144732dd

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

* commit '4104abf875e16ad54c248ce602e573d2144732dd':
  Fix setTextAppearance for styles with dots.

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index aeb70e9..05e38b4 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -482,16 +482,7 @@
             // 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());
             }
         }