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

Commit 4c0f0e6c authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by android-build-merger
Browse files

Merge "Fix setting styles in custom views." into lmp-dev 

automerge: 5c22a79b

* commit '5c22a79b':
  Fix setting styles in custom views.
parents 3cf0640d 5c22a79b

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

+17 −0
Original line number Diff line number Diff line
@@ -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();

        }