Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ab79551 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by android-build-merger
Browse files

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

automerge: ddc83dfa

* commit 'ddc83dfa':
  Fix setTextAppearance for styles with dots.
parents 1150292d ddc83dfa

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

+1 −10
Original line number Original line Diff line number Diff line
@@ -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.

            // In some cases, style may not be a dynamic id, so we do a full search.

            ResourceReference ref = resolveId(resid);

            ResourceReference ref = resolveId(resid);

            if (ref != null) {

            if (ref != null) {

                if (ref.isFramework()) {

                mRenderResources.getStyle(ref.getName(), ref.isFramework());

                    ref =

                      getRenderResources().getFrameworkResource(ResourceType.STYLE, ref.getName());

                } else {

                    ref =

                      getRenderResources().getProjectResource(ResourceType.STYLE, ref.getName());

                }

                if (ref instanceof StyleResourceValue) {

                    style = ((StyleResourceValue) ref);

                }

            }

            }

        }

        }