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

Commit 0da2676e authored by Xavier Ducrohet's avatar Xavier Ducrohet
Browse files

Minor fix for the parent style computation in the layoutlib. 

This is an SDK change only.

Change-Id: Iae493184ae76b2e21200dd6bb48795ff74f79ab3
parent ae210437

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

+11 −8
Original line number Diff line number Diff line
@@ -675,9 +675,12 @@ public final class Bridge implements ILayoutBridge { 
            name = name.substring(BridgeConstants.PREFIX_ANDROID.length());

        }



        // at this point we could have the format style/<name>. we want only the name

        // at this point we could have the format <type>/<name>. we want only the name as long as

        // the type is style.

        if (name.startsWith(BridgeConstants.REFERENCE_STYLE)) {

            name = name.substring(BridgeConstants.REFERENCE_STYLE.length());

        } else if (name.indexOf('/') != -1) {

            return null;

        }



        IResourceValue parent = null;
@@ -697,7 +700,7 @@ public final class Bridge implements ILayoutBridge { 
            return (IStyleResourceValue)parent;

        }



        sLogger.error(String.format("Unable to resolve parent style name: ", parentName));

        sLogger.error(String.format("Unable to resolve parent style name: %s", parentName));



        return null;

    }