Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31eeb08b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents a72902a0 4cbb4414

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -766,6 +766,7 @@ package android { 
    field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131

    field public static final int itemPadding = 16843565; // 0x101032d

    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 key = 16843240; // 0x10101e8

    field public static final int keyBackground = 16843315; // 0x1010233

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -884,6 +884,7 @@ package android { 
    field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131

    field public static final int itemPadding = 16843565; // 0x101032d

    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 key = 16843240; // 0x10101e8

    field public static final int keyBackground = 16843315; // 0x1010233

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -766,6 +766,7 @@ package android { 
    field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131

    field public static final int itemPadding = 16843565; // 0x101032d

    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 key = 16843240; // 0x10101e8

    field public static final int keyBackground = 16843315; // 0x1010233

core/java/android/widget/TextView.java

+3 −0
Original line number Diff line number Diff line
@@ -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;

            }

        }

core/res/res/values/attrs.xml

+7 −0
Original line number Diff line number Diff line
@@ -4776,6 +4776,13 @@ 
        <attr name="autoSizeMinTextSize" format="dimension" />

        <!-- The maximum text size constraint to be used when auto-sizing text. -->

        <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 name="TextViewAppearance">

        <!-- Base text color, typeface, size, and style. -->