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

Commit ad989105 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check resource type, not directory for colors"

parents bb6ef65c 43f7c8ee

core/java/android/content/res/ResourcesImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -856,7 +856,8 @@ public class ResourcesImpl { 
            stack.push(id);

            try {

                if (file.endsWith(".xml")) {

                    if (file.startsWith("res/color/")) {

                    final String typeName = getResourceTypeName(id);

                    if (typeName != null && typeName.equals("color")) {

                        dr = loadColorOrXmlDrawable(wrapper, value, id, density, file);

                    } else {

                        dr = loadXmlDrawable(wrapper, value, id, density, file);