diff options
| author | Seigo Nonaka <nona@google.com> | 2017-04-21 21:44:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-21 21:44:24 +0000 |
| commit | e7c2e03d22cab78775309e87451002f5bc382afd (patch) | |
| tree | 8026b4a4927a285aefde69f443ee6d7d94fa0b85 /core/java | |
| parent | abf54a61bc103df4aa108adabcb3fa1fc03bb911 (diff) | |
| parent | 31eeb08bdbe8f6ababe6414db729ac9449b01fc9 (diff) | |
Merge "Introduce TextView attribute for control justification." into oc-dev
am: 31eeb08bdb
Change-Id: If757a42d277a4a313eafe08196610eb1cebc2bf5
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 92c16af31cca..f42d6c81f444 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -1371,6 +1371,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener autoSizePresetTextSizes.recycle(); } break; + case com.android.internal.R.styleable.TextView_justificationMode: + mJustificationMode = a.getInt(attr, Layout.JUSTIFICATION_MODE_NONE); + break; } } |