diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-03-13 21:55:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-13 21:55:30 +0000 |
| commit | 039261a71d36325638943c6e45fa6ace0e8de770 (patch) | |
| tree | 3c9404b312389479c2c591389c814f97dd3bb31d /core/java | |
| parent | bc4b1b84e7d8265acbf183f07376bb3748f76ef6 (diff) | |
| parent | 687bf8fe58405298a0af68e89dd4997272ea9aff (diff) | |
Merge "Add @attr for justificationMode" into pi-dev
Diffstat (limited to 'core/java')
| -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 6fe64a03a95c..f77a6b72787f 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -291,6 +291,7 @@ import java.util.Locale; * @attr ref android.R.styleable#TextView_drawableTintMode * @attr ref android.R.styleable#TextView_lineSpacingExtra * @attr ref android.R.styleable#TextView_lineSpacingMultiplier + * @attr ref android.R.styleable#TextView_justificationMode * @attr ref android.R.styleable#TextView_marqueeRepeatLimit * @attr ref android.R.styleable#TextView_inputType * @attr ref android.R.styleable#TextView_imeOptions |