diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-27 04:11:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-27 04:11:22 +0000 |
| commit | 024b8dc48ee702fbb9b4881ba3226757ebcf177a (patch) | |
| tree | fcb46a6a403e145dbc7bf8db5a9fe3f5cf7737ec /core/java/android | |
| parent | a21ec6618d6577c6d8209691b2e7ecef95749cfc (diff) | |
| parent | b06144c5ed7de7045ea6dbcef362a77921de6914 (diff) | |
Merge "Add textFontWeight attribute to documentation"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/TextView.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 4ea2ced084e2..9a6006526cf7 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -247,6 +247,7 @@ import java.util.function.Supplier; * @attr ref android.R.styleable#TextView_textColorHint * @attr ref android.R.styleable#TextView_textAppearance * @attr ref android.R.styleable#TextView_textColorLink + * @attr ref android.R.styleable#TextView_textFontWeight * @attr ref android.R.styleable#TextView_textSize * @attr ref android.R.styleable#TextView_textScaleX * @attr ref android.R.styleable#TextView_fontFamily |