diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2019-06-07 15:51:30 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-07 15:51:30 -0700 |
| commit | c38e9716a879ec0d14238f734d98a6ac1b226207 (patch) | |
| tree | ff350453a0475aa444ae14ee8e50093dfc674897 /core/java/android/widget/TextView.java | |
| parent | 67f803979959e3aebf482f644622cee503e8cc6a (diff) | |
| parent | e53837182ccca5d98c5ce7feb04c12d87458bff5 (diff) | |
Merge "Record textAppearance information for TextView." into qt-dev
am: e53837182c
Change-Id: I93a7c449a72bab5f25690505453432b551e3ff94
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 f02034a4d569..ac144b202bd5 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -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 */); |