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

Commit 88aa9a89 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by android-build-merger
Browse files

Merge "Record textAppearance information for TextView." into qt-dev am: e5383718 

am: c38e9716

Change-Id: Ie3ac9db452e18cbe606045f448e5682443411793
parents 821e6b71 c38e9716

core/java/android/widget/TextView.java

+4 −0
Original line number Diff line number Diff line
@@ -1016,6 +1016,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
         */

        TypedArray a = theme.obtainStyledAttributes(attrs,

                com.android.internal.R.styleable.TextViewAppearance, defStyleAttr, defStyleRes);

        saveAttributeDataForStyleable(context, com.android.internal.R.styleable.TextViewAppearance,

                attrs, a, defStyleAttr, defStyleRes);

        TypedArray appearance = null;

        int ap = a.getResourceId(

                com.android.internal.R.styleable.TextViewAppearance_textAppearance, -1);
@@ -1023,6 +1025,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        if (ap != -1) {

            appearance = theme.obtainStyledAttributes(

                    ap, com.android.internal.R.styleable.TextAppearance);

            saveAttributeDataForStyleable(context, com.android.internal.R.styleable.TextAppearance,

                    null, appearance, 0, ap);

        }

        if (appearance != null) {

            readTextAppearance(context, appearance, attributes, false /* styleArray */);