Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c38e9716a8

Change-Id: I82607f8843f5f34a4f169efcb6cf0836738c6d53
This commit is contained in:
Aurimas Liutikas
2019-06-07 16:01:31 -07:00
committed by android-build-merger
parent 17c5183995 c38e9716a8
commit 6fa3d16fda
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/TextView.java
View File

@@ -1016,6 +1016,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
*/ */
TypedArray a = theme.obtainStyledAttributes(attrs, TypedArray a = theme.obtainStyledAttributes(attrs,
com.android.internal.R.styleable.TextViewAppearance, defStyleAttr, defStyleRes); com.android.internal.R.styleable.TextViewAppearance, defStyleAttr, defStyleRes);
saveAttributeDataForStyleable(context, com.android.internal.R.styleable.TextViewAppearance,
attrs, a, defStyleAttr, defStyleRes);
TypedArray appearance = null; TypedArray appearance = null;
int ap = a.getResourceId( int ap = a.getResourceId(
com.android.internal.R.styleable.TextViewAppearance_textAppearance, -1); com.android.internal.R.styleable.TextViewAppearance_textAppearance, -1);
@@ -1023,6 +1025,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (ap != -1) { if (ap != -1) {
appearance = theme.obtainStyledAttributes( appearance = theme.obtainStyledAttributes(
ap, com.android.internal.R.styleable.TextAppearance); ap, com.android.internal.R.styleable.TextAppearance);
saveAttributeDataForStyleable(context, com.android.internal.R.styleable.TextAppearance,
null, appearance, 0, ap);
} }
if (appearance != null) { if (appearance != null) {
readTextAppearance(context, appearance, attributes, false /* styleArray */); readTextAppearance(context, appearance, attributes, false /* styleArray */);