From 2c9fbdd29c2f68f7e32583d47109c8f446865d88 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Tue, 18 Nov 2014 22:44:00 +0000 Subject: Fix setTextAppearance for styles with dots. Bug: http://b.android.com/78842 Change-Id: I65923134b2d3812030e2b7dd8ab96363b0647c1f --- .../com/android/layoutlib/bridge/android/BridgeContext.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) 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 aeb70e9e2f76..05e38b4a709d 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 @@ 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()); } } -- cgit v1.2.3-59-g8ed1b