diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-07 22:35:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-07 22:35:55 +0000 |
| commit | e53837182ccca5d98c5ce7feb04c12d87458bff5 (patch) | |
| tree | 2729d440746bbe2cdf1db415440ace815b066d00 /core/java/android/widget/TextView.java | |
| parent | be063ffb592d259bebd2913681f551060165b593 (diff) | |
| parent | 950445927912b3e1ee6e78e9e339cdfb14f02fb6 (diff) | |
Merge "Record textAppearance information for TextView." into qt-dev
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 073965b35101..62598fce5947 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -1011,6 +1011,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); @@ -1018,6 +1020,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 */); |