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

Commit 1cd4612c authored by Alan Viverette's avatar Alan Viverette
Browse files

Fix attribute extraction, use color attrs in Quantum drawables 

Removes some unused entries in the Quantum themes and styles and
collapses identical styles since we don't have separate drawables
anymore. Adds some Quantum text appearances as styles.

BUG: 12368046
Change-Id: I9334feb87391cd54ad3b77b297d135de436e1417
parent 583080d8

api/current.txt

+171 −174

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/content/res/TypedArray.java

+2 −3
Original line number Diff line number Diff line
@@ -793,10 +793,9 @@ public class TypedArray { 
    public int[] extractThemeAttrs() {

        int[] attrs = null;



        final int N = getIndexCount();

        final int N = length();

        for (int i = 0; i < N; i++) {

            final int index = getIndex(i);

            final int attrId = getThemeAttributeId(index, 0);

            final int attrId = getThemeAttributeId(i, 0);

            if (attrId != 0) {

                if (attrs == null) {

                    attrs = new int[N];