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

Commit f5a84f8a authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android Git Automerger
Browse files

am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair 

Merge commit 'dfe25b0e' into eclair-plus-aosp

* commit 'dfe25b0e':
  LayoutLib: support for custom styles.
parents 495d820c dfe25b0e

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

+14 −3
Original line number Diff line number Diff line
@@ -259,7 +259,18 @@ public final class BridgeContext extends Context { 


        // resolve the defStyleAttr value into a IStyleResourceValue

        IStyleResourceValue defStyleValues = null;

        if (defStyleAttr != 0) {



        // look for a custom style.

        String customStyle = parser.getAttributeValue(null /* namespace*/, "style");

        if (customStyle != null) {

            IResourceValue item = findResValue(customStyle);



            if (item instanceof IStyleResourceValue) {

                defStyleValues = (IStyleResourceValue)item;

            }

        }



        if (defStyleValues == null && defStyleAttr != 0) {

            // get the name from the int.

            String defStyleName = searchAttr(defStyleAttr);