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

Commit 903e38de authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Update Layout.Builder APIs 

- Update documentation of
  setLineSpacingAmount/setLineSpacingMultipliser.
- Rename isIncludeFontPadding to isFontPaddingIncluded
- Fix bug of getRightIndents.

Bug: 297101305
Test: CtsTextTestCases
Change-Id: I81bf22cf0c034d7437a775ea96982da51d6ab569
parent c993acbf

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -47549,7 +47549,7 @@ package android.text { 
    method @IntRange(from=0) public final int getWidth();

    method public final void increaseWidthTo(int);

    method public boolean isFallbackLineSpacingEnabled();

    method public final boolean isIncludeFontPadding();

    method public final boolean isFontPaddingIncluded();

    method public boolean isRtlCharAt(int);

    method protected final boolean isSpanned();

    field public static final int BREAK_STRATEGY_BALANCED = 2; // 0x2
@@ -47585,13 +47585,13 @@ package android.text { 
    method @NonNull public android.text.Layout.Builder setEllipsize(@Nullable android.text.TextUtils.TruncateAt);

    method @NonNull public android.text.Layout.Builder setEllipsizedWidth(@IntRange(from=0) int);

    method @NonNull public android.text.Layout.Builder setFallbackLineSpacingEnabled(boolean);

    method @NonNull public android.text.Layout.Builder setFontPaddingIncluded(boolean);

    method @NonNull public android.text.Layout.Builder setHyphenationFrequency(int);

    method @NonNull public android.text.Layout.Builder setIncludeFontPadding(boolean);

    method @NonNull public android.text.Layout.Builder setJustificationMode(int);

    method @NonNull public android.text.Layout.Builder setLeftIndents(@Nullable int[]);

    method @NonNull public android.text.Layout.Builder setLineBreakConfig(@NonNull android.graphics.text.LineBreakConfig);

    method @NonNull public android.text.Layout.Builder setLineSpacingAmount(float);

    method @NonNull public android.text.Layout.Builder setLineSpacingMultiplier(float);

    method @NonNull public android.text.Layout.Builder setLineSpacingMultiplier(@FloatRange(from=0) float);

    method @NonNull public android.text.Layout.Builder setMaxLines(@IntRange(from=1) int);

    method @NonNull public android.text.Layout.Builder setRightIndents(@Nullable int[]);

    method @NonNull public android.text.Layout.Builder setTextDirectionHeuristic(@NonNull android.text.TextDirectionHeuristic);

core/java/android/text/Layout.java

+8 −7
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.text;



import android.annotation.FloatRange;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;
@@ -3407,7 +3408,7 @@ public abstract class Layout { 
         *

         * The specified amount of pixels will be added to each line.

         *

         * The default value is {@code 0}.

         * The default value is {@code 0}. The negative value is allowed for squeezing lines.

         *

         * @param amount an amount of pixels to be added to line height.

         * @return this builder instance.
@@ -3435,7 +3436,7 @@ public abstract class Layout { 
         * @see StaticLayout.Builder#setLineSpacing(float, float)

         */

        @NonNull

        public Builder setLineSpacingMultiplier(float multiplier) {

        public Builder setLineSpacingMultiplier(@FloatRange(from = 0) float multiplier) {

            mSpacingMult = multiplier;

            return this;

        }
@@ -3450,11 +3451,11 @@ public abstract class Layout { 
         *

         * @param includeFontPadding true for including extra space into first and last line.

         * @return this builder instance.

         * @see Layout#isIncludeFontPadding()

         * @see Layout#isFontPaddingIncluded()

         * @see StaticLayout.Builder#setIncludePad(boolean)

         */

        @NonNull

        public Builder setIncludeFontPadding(boolean includeFontPadding) {

        public Builder setFontPaddingIncluded(boolean includeFontPadding) {

            mIncludePad = includeFontPadding;

            return this;

        }
@@ -3853,10 +3854,10 @@ public abstract class Layout { 
     * Returns true if this layout is created with increased line height.

     *

     * @return true if the layout is created with increased line height.

     * @see Layout.Builder#setIncludeFontPadding(boolean)

     * @see Layout.Builder#setFontPaddingIncluded(boolean)

     * @see StaticLayout.Builder#setIncludePad(boolean)

     */

    public final boolean isIncludeFontPadding() {

    public final boolean isFontPaddingIncluded() {

        return mIncludePad;

    }
@@ -3979,7 +3980,7 @@ public abstract class Layout { 
    @Nullable

    public final int[] getRightIndents() {

        if (mRightIndents == null) {

            return mLeftIndents;

            return null;

        }

        int[] newArray = new int[mRightIndents.length];

        System.arraycopy(mRightIndents, 0, newArray, 0, newArray.length);