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

Merge "Introduce TextView attribute for control justification." into oc-dev

Browse Source 
am: 31eeb08bdb

Change-Id: If757a42d277a4a313eafe08196610eb1cebc2bf5
This commit is contained in:
Seigo Nonaka
2017-04-21 21:44:24 +00:00
committed by android-build-merger
parent abf54a61bc 31eeb08bdb
commit e7c2e03d22
6 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -766,6 +766,7 @@ package android {
field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131 field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131
field public static final int itemPadding = 16843565; // 0x101032d field public static final int itemPadding = 16843565; // 0x101032d
field public static final int itemTextAppearance = 16843052; // 0x101012c field public static final int itemTextAppearance = 16843052; // 0x101012c
field public static final int justificationMode = 16844138; // 0x101056a
field public static final int keepScreenOn = 16843286; // 0x1010216 field public static final int keepScreenOn = 16843286; // 0x1010216
field public static final int key = 16843240; // 0x10101e8 field public static final int key = 16843240; // 0x10101e8
field public static final int keyBackground = 16843315; // 0x1010233 field public static final int keyBackground = 16843315; // 0x1010233

1
api/system-current.txt
View File

@@ -884,6 +884,7 @@ package android {
field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131 field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131
field public static final int itemPadding = 16843565; // 0x101032d field public static final int itemPadding = 16843565; // 0x101032d
field public static final int itemTextAppearance = 16843052; // 0x101012c field public static final int itemTextAppearance = 16843052; // 0x101012c
field public static final int justificationMode = 16844138; // 0x101056a
field public static final int keepScreenOn = 16843286; // 0x1010216 field public static final int keepScreenOn = 16843286; // 0x1010216
field public static final int key = 16843240; // 0x10101e8 field public static final int key = 16843240; // 0x10101e8
field public static final int keyBackground = 16843315; // 0x1010233 field public static final int keyBackground = 16843315; // 0x1010233

1
api/test-current.txt
View File

@@ -766,6 +766,7 @@ package android {
field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131 field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131
field public static final int itemPadding = 16843565; // 0x101032d field public static final int itemPadding = 16843565; // 0x101032d
field public static final int itemTextAppearance = 16843052; // 0x101012c field public static final int itemTextAppearance = 16843052; // 0x101012c
field public static final int justificationMode = 16844138; // 0x101056a
field public static final int keepScreenOn = 16843286; // 0x1010216 field public static final int keepScreenOn = 16843286; // 0x1010216
field public static final int key = 16843240; // 0x10101e8 field public static final int key = 16843240; // 0x10101e8
field public static final int keyBackground = 16843315; // 0x1010233 field public static final int keyBackground = 16843315; // 0x1010233

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

@@ -1371,6 +1371,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
autoSizePresetTextSizes.recycle(); autoSizePresetTextSizes.recycle();
} }
break; break;
case com.android.internal.R.styleable.TextView_justificationMode:
mJustificationMode = a.getInt(attr, Layout.JUSTIFICATION_MODE_NONE);
break;
} }
} }

7
core/res/res/values/attrs.xml
View File

@@ -4776,6 +4776,13 @@
<attr name="autoSizeMinTextSize" format="dimension" /> <attr name="autoSizeMinTextSize" format="dimension" />
<!-- The maximum text size constraint to be used when auto-sizing text. --> <!-- The maximum text size constraint to be used when auto-sizing text. -->
<attr name="autoSizeMaxTextSize" format="dimension" /> <attr name="autoSizeMaxTextSize" format="dimension" />
<!-- Mode for justification. -->
<attr name="justificationMode">
<!-- No justification. -->
<enum name="none" value="0" />
<!-- Justification by stretching word spacing. -->
<enum name="inter_word" value = "1" />
</attr>
</declare-styleable> </declare-styleable>
<declare-styleable name="TextViewAppearance"> <declare-styleable name="TextViewAppearance">
<!-- Base text color, typeface, size, and style. --> <!-- Base text color, typeface, size, and style. -->

1
core/res/res/values/public.xml
View File

@@ -2821,6 +2821,7 @@
<public name="requiredSystemPropertyName" /> <public name="requiredSystemPropertyName" />
<!-- @hide @SystemApi --> <!-- @hide @SystemApi -->
<public name="requiredSystemPropertyValue" /> <public name="requiredSystemPropertyValue" />
<public name="justificationMode" />
</public-group> </public-group>
<public-group type="style" first-id="0x010302e0"> <public-group type="style" first-id="0x010302e0">