Add setLineBreakConfig API (94904647) · Commits · e / os / android_frameworks_base

core/api/current.txt

+18 −0

core/java/android/text/MeasuredParagraph.java

+27 −13

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@ import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.graphics.Paint;		import android.graphics.Paint;
	import android.graphics.Rect;		import android.graphics.Rect;
			import android.graphics.text.LineBreakConfig;
	import android.graphics.text.MeasuredText;		import android.graphics.text.MeasuredText;
	import android.text.AutoGrowArray.ByteArray;		import android.text.AutoGrowArray.ByteArray;
	import android.text.AutoGrowArray.FloatArray;		import android.text.AutoGrowArray.FloatArray;
	@@ -124,7 +125,7 @@ public class MeasuredParagraph {
	// The native MeasuredParagraph.		// The native MeasuredParagraph.
	private @Nullable MeasuredText mMeasuredText;		private @Nullable MeasuredText mMeasuredText;

	// Following two objects are for avoiding object allocation.		// Following three objects are for avoiding object allocation.
	private @NonNull TextPaint mCachedPaint = new TextPaint();		private @NonNull TextPaint mCachedPaint = new TextPaint();
	private @Nullable Paint.FontMetricsInt mCachedFm;		private @Nullable Paint.FontMetricsInt mCachedFm;

	@@ -350,7 +351,8 @@ public class MeasuredParagraph {
	if (mt.mSpanned == null) {		if (mt.mSpanned == null) {
	// No style change by MetricsAffectingSpan. Just measure all text.		// No style change by MetricsAffectingSpan. Just measure all text.
	mt.applyMetricsAffectingSpan(		mt.applyMetricsAffectingSpan(
	paint, null /* spans /, start, end, null / native builder ptr */);		paint, null /* lineBreakConfig /, null / spans */, start, end,
			null /* native builder ptr */);
	} else {		} else {
	// There may be a MetricsAffectingSpan. Split into span transitions and apply styles.		// There may be a MetricsAffectingSpan. Split into span transitions and apply styles.
	int spanEnd;		int spanEnd;
	@@ -360,7 +362,8 @@ public class MeasuredParagraph {
	MetricAffectingSpan.class);		MetricAffectingSpan.class);
	spans = TextUtils.removeEmptySpans(spans, mt.mSpanned, MetricAffectingSpan.class);		spans = TextUtils.removeEmptySpans(spans, mt.mSpanned, MetricAffectingSpan.class);
	mt.applyMetricsAffectingSpan(		mt.applyMetricsAffectingSpan(
	paint, spans, spanStart, spanEnd, null /* native builder ptr */);		paint, null /* line break config */, spans, spanStart, spanEnd,
			null /* native builder ptr */);
	}		}
	}		}
	return mt;		return mt;
	@@ -373,6 +376,7 @@ public class MeasuredParagraph {
	* result to recycle and returns recycle.		* result to recycle and returns recycle.
	*		*
	* @param paint the paint to be used for rendering the text.		* @param paint the paint to be used for rendering the text.
			* @param lineBreakConfig the line break configuration for text wrapping.
	* @param text the character sequence to be measured		* @param text the character sequence to be measured
	* @param start the inclusive start offset of the target region in the text		* @param start the inclusive start offset of the target region in the text
	* @param end the exclusive end offset of the target region in the text		* @param end the exclusive end offset of the target region in the text
	@@ -386,6 +390,7 @@ public class MeasuredParagraph {
	*/		*/
	public static @NonNull MeasuredParagraph buildForStaticLayout(		public static @NonNull MeasuredParagraph buildForStaticLayout(
	@NonNull TextPaint paint,		@NonNull TextPaint paint,
			@Nullable LineBreakConfig lineBreakConfig,
	@NonNull CharSequence text,		@NonNull CharSequence text,
	@IntRange(from = 0) int start,		@IntRange(from = 0) int start,
	@IntRange(from = 0) int end,		@IntRange(from = 0) int end,
	@@ -411,7 +416,8 @@ public class MeasuredParagraph {
	} else {		} else {
	if (mt.mSpanned == null) {		if (mt.mSpanned == null) {
	// No style change by MetricsAffectingSpan. Just measure all text.		// No style change by MetricsAffectingSpan. Just measure all text.
	mt.applyMetricsAffectingSpan(paint, null /* spans */, start, end, builder);		mt.applyMetricsAffectingSpan(paint, lineBreakConfig, null /* spans */, start, end,
			builder);
	mt.mSpanEndCache.append(end);		mt.mSpanEndCache.append(end);
	} else {		} else {
	// There may be a MetricsAffectingSpan. Split into span transitions and apply		// There may be a MetricsAffectingSpan. Split into span transitions and apply
	@@ -424,7 +430,9 @@ public class MeasuredParagraph {
	MetricAffectingSpan.class);		MetricAffectingSpan.class);
	spans = TextUtils.removeEmptySpans(spans, mt.mSpanned,		spans = TextUtils.removeEmptySpans(spans, mt.mSpanned,
	MetricAffectingSpan.class);		MetricAffectingSpan.class);
	mt.applyMetricsAffectingSpan(paint, spans, spanStart, spanEnd, builder);		// TODO: Update line break config with spans.
			mt.applyMetricsAffectingSpan(paint, lineBreakConfig, spans, spanStart, spanEnd,
			builder);
	mt.mSpanEndCache.append(spanEnd);		mt.mSpanEndCache.append(spanEnd);
	}		}
	}		}
	@@ -500,12 +508,13 @@ public class MeasuredParagraph {
	private void applyReplacementRun(@NonNull ReplacementSpan replacement,		private void applyReplacementRun(@NonNull ReplacementSpan replacement,
	@IntRange(from = 0) int start, // inclusive, in copied buffer		@IntRange(from = 0) int start, // inclusive, in copied buffer
	@IntRange(from = 0) int end, // exclusive, in copied buffer		@IntRange(from = 0) int end, // exclusive, in copied buffer
			@NonNull TextPaint paint,
	@Nullable MeasuredText.Builder builder) {		@Nullable MeasuredText.Builder builder) {
	// Use original text. Shouldn't matter.		// Use original text. Shouldn't matter.
	// TODO: passing uninitizlied FontMetrics to developers. Do we need to keep this for		// TODO: passing uninitizlied FontMetrics to developers. Do we need to keep this for
	// backward compatibility? or Should we initialize them for getFontMetricsInt?		// backward compatibility? or Should we initialize them for getFontMetricsInt?
	final float width = replacement.getSize(		final float width = replacement.getSize(
	mCachedPaint, mSpanned, start + mTextStart, end + mTextStart, mCachedFm);		paint, mSpanned, start + mTextStart, end + mTextStart, mCachedFm);
	if (builder == null) {		if (builder == null) {
	// Assigns all width to the first character. This is the same behavior as minikin.		// Assigns all width to the first character. This is the same behavior as minikin.
	mWidths.set(start, width);		mWidths.set(start, width);
	@@ -514,22 +523,24 @@ public class MeasuredParagraph {
	}		}
	mWholeWidth += width;		mWholeWidth += width;
	} else {		} else {
	builder.appendReplacementRun(mCachedPaint, end - start, width);		builder.appendReplacementRun(paint, end - start, width);
	}		}
	}		}

	private void applyStyleRun(@IntRange(from = 0) int start, // inclusive, in copied buffer		private void applyStyleRun(@IntRange(from = 0) int start, // inclusive, in copied buffer
	@IntRange(from = 0) int end, // exclusive, in copied buffer		@IntRange(from = 0) int end, // exclusive, in copied buffer
			@NonNull TextPaint paint,
			@Nullable LineBreakConfig config,
	@Nullable MeasuredText.Builder builder) {		@Nullable MeasuredText.Builder builder) {

	if (mLtrWithoutBidi) {		if (mLtrWithoutBidi) {
	// If the whole text is LTR direction, just apply whole region.		// If the whole text is LTR direction, just apply whole region.
	if (builder == null) {		if (builder == null) {
	mWholeWidth += mCachedPaint.getTextRunAdvances(		mWholeWidth += paint.getTextRunAdvances(
	mCopiedBuffer, start, end - start, start, end - start, false /* isRtl */,		mCopiedBuffer, start, end - start, start, end - start, false /* isRtl */,
	mWidths.getRawArray(), start);		mWidths.getRawArray(), start);
	} else {		} else {
	builder.appendStyleRun(mCachedPaint, end - start, false /* isRtl */);		builder.appendStyleRun(paint, config, end - start, false /* isRtl */);
	}		}
	} else {		} else {
	// If there is multiple bidi levels, split into individual bidi level and apply style.		// If there is multiple bidi levels, split into individual bidi level and apply style.
	@@ -541,11 +552,11 @@ public class MeasuredParagraph {
	final boolean isRtl = (level & 0x1) != 0;		final boolean isRtl = (level & 0x1) != 0;
	if (builder == null) {		if (builder == null) {
	final int levelLength = levelEnd - levelStart;		final int levelLength = levelEnd - levelStart;
	mWholeWidth += mCachedPaint.getTextRunAdvances(		mWholeWidth += paint.getTextRunAdvances(
	mCopiedBuffer, levelStart, levelLength, levelStart, levelLength,		mCopiedBuffer, levelStart, levelLength, levelStart, levelLength,
	isRtl, mWidths.getRawArray(), levelStart);		isRtl, mWidths.getRawArray(), levelStart);
	} else {		} else {
	builder.appendStyleRun(mCachedPaint, levelEnd - levelStart, isRtl);		builder.appendStyleRun(paint, config, levelEnd - levelStart, isRtl);
	}		}
	if (levelEnd == end) {		if (levelEnd == end) {
	break;		break;
	@@ -559,6 +570,7 @@ public class MeasuredParagraph {

	private void applyMetricsAffectingSpan(		private void applyMetricsAffectingSpan(
	@NonNull TextPaint paint,		@NonNull TextPaint paint,
			@Nullable LineBreakConfig lineBreakConfig,
	@Nullable MetricAffectingSpan[] spans,		@Nullable MetricAffectingSpan[] spans,
	@IntRange(from = 0) int start, // inclusive, in original text buffer		@IntRange(from = 0) int start, // inclusive, in original text buffer
	@IntRange(from = 0) int end, // exclusive, in original text buffer		@IntRange(from = 0) int end, // exclusive, in original text buffer
	@@ -595,9 +607,11 @@ public class MeasuredParagraph {
	}		}

	if (replacement != null) {		if (replacement != null) {
	applyReplacementRun(replacement, startInCopiedBuffer, endInCopiedBuffer, builder);		applyReplacementRun(replacement, startInCopiedBuffer, endInCopiedBuffer, mCachedPaint,
			builder);
	} else {		} else {
	applyStyleRun(startInCopiedBuffer, endInCopiedBuffer, builder);		applyStyleRun(startInCopiedBuffer, endInCopiedBuffer, mCachedPaint,
			lineBreakConfig, builder);
	}		}

	if (needFontMetrics) {		if (needFontMetrics) {

core/java/android/text/PrecomputedText.java

+79 −14

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@ import android.annotation.IntRange;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.graphics.Rect;		import android.graphics.Rect;
			import android.graphics.text.LineBreakConfig;
	import android.graphics.text.MeasuredText;		import android.graphics.text.MeasuredText;
	import android.text.style.MetricAffectingSpan;		import android.text.style.MetricAffectingSpan;

	@@ -96,6 +97,9 @@ public class PrecomputedText implements Spannable {
	// The hyphenation frequency for this measured text.		// The hyphenation frequency for this measured text.
	private final @Layout.HyphenationFrequency int mHyphenationFrequency;		private final @Layout.HyphenationFrequency int mHyphenationFrequency;

			// The line break configuration for calculating text wrapping.
			private final @Nullable LineBreakConfig mLineBreakConfig;

	/**		/**
	* A builder for creating {@link Params}.		* A builder for creating {@link Params}.
	*/		*/
	@@ -113,6 +117,9 @@ public class PrecomputedText implements Spannable {
	private @Layout.HyphenationFrequency int mHyphenationFrequency =		private @Layout.HyphenationFrequency int mHyphenationFrequency =
	Layout.HYPHENATION_FREQUENCY_NORMAL;		Layout.HYPHENATION_FREQUENCY_NORMAL;

			// The line break configuration for calculating text wrapping.
			private @Nullable LineBreakConfig mLineBreakConfig;

	/**		/**
	* Builder constructor.		* Builder constructor.
	*		*
	@@ -130,6 +137,7 @@ public class PrecomputedText implements Spannable {
	mTextDir = params.mTextDir;		mTextDir = params.mTextDir;
	mBreakStrategy = params.mBreakStrategy;		mBreakStrategy = params.mBreakStrategy;
	mHyphenationFrequency = params.mHyphenationFrequency;		mHyphenationFrequency = params.mHyphenationFrequency;
			mLineBreakConfig = params.mLineBreakConfig;
	}		}

	/**		/**
	@@ -176,25 +184,42 @@ public class PrecomputedText implements Spannable {
	return this;		return this;
	}		}

			/**
			* Set the line break config for the text wrapping.
			*
			* @param lineBreakConfig the newly line break configuration.
			* @return this builder, useful for chaining.
			* @see StaticLayout.Builder#setLineBreakConfig
			*/
			public @NonNull Builder setLineBreakConfig(@NonNull LineBreakConfig lineBreakConfig) {
			mLineBreakConfig = lineBreakConfig;
			return this;
			}

	/**		/**
	* Build the {@link Params}.		* Build the {@link Params}.
	*		*
	* @return the layout parameter		* @return the layout parameter
	*/		*/
	public @NonNull Params build() {		public @NonNull Params build() {
	return new Params(mPaint, mTextDir, mBreakStrategy, mHyphenationFrequency);		return new Params(mPaint, mLineBreakConfig, mTextDir, mBreakStrategy,
			mHyphenationFrequency);
	}		}
	}		}

	// This is public hidden for internal use.		// This is public hidden for internal use.
	// For the external developers, use Builder instead.		// For the external developers, use Builder instead.
	/** @hide */		/** @hide */
	public Params(@NonNull TextPaint paint, @NonNull TextDirectionHeuristic textDir,		public Params(@NonNull TextPaint paint,
	@Layout.BreakStrategy int strategy, @Layout.HyphenationFrequency int frequency) {		@Nullable LineBreakConfig lineBreakConfig,
			@NonNull TextDirectionHeuristic textDir,
			@Layout.BreakStrategy int strategy,
			@Layout.HyphenationFrequency int frequency) {
	mPaint = paint;		mPaint = paint;
	mTextDir = textDir;		mTextDir = textDir;
	mBreakStrategy = strategy;		mBreakStrategy = strategy;
	mHyphenationFrequency = frequency;		mHyphenationFrequency = frequency;
			mLineBreakConfig = lineBreakConfig;
	}		}

	/**		/**
	@@ -233,6 +258,15 @@ public class PrecomputedText implements Spannable {
	return mHyphenationFrequency;		return mHyphenationFrequency;
	}		}

			/**
			* Return the line break configuration for this text.
			*
			* @return the current line break configuration, null if no line break configuration is set.
			*/
			public @Nullable LineBreakConfig getLineBreakConfig() {
			return mLineBreakConfig;
			}

	/** @hide */		/** @hide */
	@IntDef(value = { UNUSABLE, NEED_RECOMPUTE, USABLE })		@IntDef(value = { UNUSABLE, NEED_RECOMPUTE, USABLE })
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	@@ -262,8 +296,9 @@ public class PrecomputedText implements Spannable {
	/** @hide */		/** @hide */
	public @CheckResultUsableResult int checkResultUsable(@NonNull TextPaint paint,		public @CheckResultUsableResult int checkResultUsable(@NonNull TextPaint paint,
	@NonNull TextDirectionHeuristic textDir, @Layout.BreakStrategy int strategy,		@NonNull TextDirectionHeuristic textDir, @Layout.BreakStrategy int strategy,
	@Layout.HyphenationFrequency int frequency) {		@Layout.HyphenationFrequency int frequency, @Nullable LineBreakConfig lbConfig) {
	if (mBreakStrategy == strategy && mHyphenationFrequency == frequency		if (mBreakStrategy == strategy && mHyphenationFrequency == frequency
			&& isLineBreakEquals(mLineBreakConfig, lbConfig)
	&& mPaint.equalsForTextMeasurement(paint)) {		&& mPaint.equalsForTextMeasurement(paint)) {
	return mTextDir == textDir ? USABLE : NEED_RECOMPUTE;		return mTextDir == textDir ? USABLE : NEED_RECOMPUTE;
	} else {		} else {
	@@ -271,6 +306,29 @@ public class PrecomputedText implements Spannable {
	}		}
	}		}

			/**
			* Check the two LineBreakConfig instances are equal.
			* This method assumes they are equal if one parameter is null and the other parameter has
			* a LineBreakStyle value of LineBreakConfig.LINE_BREAK_STYLE_NONE.
			*
			* @param o1 the first LineBreakConfig instance.
			* @param o2 the second LineBreakConfig instance.
			* @return true if the two LineBreakConfig instances are equal.
			*/
			private boolean isLineBreakEquals(LineBreakConfig o1, LineBreakConfig o2) {
			if (Objects.equals(o1, o2)) {
			return true;
			}
			if (o1 == null && (o2 != null
			&& o2.getLineBreakStyle() == LineBreakConfig.LINE_BREAK_STYLE_NONE)) {
			return true;
			} else if (o2 == null && (o1 != null
			&& o1.getLineBreakStyle() == LineBreakConfig.LINE_BREAK_STYLE_NONE)) {
			return true;
			}
			return false;
			}

	/**		/**
	* Check if the same text layout.		* Check if the same text layout.
	*		*
	@@ -286,21 +344,25 @@ public class PrecomputedText implements Spannable {
	}		}
	Params param = (Params) o;		Params param = (Params) o;
	return checkResultUsable(param.mPaint, param.mTextDir, param.mBreakStrategy,		return checkResultUsable(param.mPaint, param.mTextDir, param.mBreakStrategy,
	param.mHyphenationFrequency) == Params.USABLE;		param.mHyphenationFrequency, param.mLineBreakConfig) == Params.USABLE;
	}		}

	@Override		@Override
	public int hashCode() {		public int hashCode() {
	// TODO: implement MinikinPaint::hashCode and use it to keep consistency with equals.		// TODO: implement MinikinPaint::hashCode and use it to keep consistency with equals.
			int lineBreakStyle = (mLineBreakConfig != null)
			? mLineBreakConfig.getLineBreakStyle() : LineBreakConfig.LINE_BREAK_STYLE_NONE;
	return Objects.hash(mPaint.getTextSize(), mPaint.getTextScaleX(), mPaint.getTextSkewX(),		return Objects.hash(mPaint.getTextSize(), mPaint.getTextScaleX(), mPaint.getTextSkewX(),
	mPaint.getLetterSpacing(), mPaint.getWordSpacing(), mPaint.getFlags(),		mPaint.getLetterSpacing(), mPaint.getWordSpacing(), mPaint.getFlags(),
	mPaint.getTextLocales(), mPaint.getTypeface(),		mPaint.getTextLocales(), mPaint.getTypeface(),
	mPaint.getFontVariationSettings(), mPaint.isElegantTextHeight(), mTextDir,		mPaint.getFontVariationSettings(), mPaint.isElegantTextHeight(), mTextDir,
	mBreakStrategy, mHyphenationFrequency);		mBreakStrategy, mHyphenationFrequency, lineBreakStyle);
	}		}

	@Override		@Override
	public String toString() {		public String toString() {
			int lineBreakStyle = (mLineBreakConfig != null)
			? mLineBreakConfig.getLineBreakStyle() : LineBreakConfig.LINE_BREAK_STYLE_NONE;
	return "{"		return "{"
	+ "textSize=" + mPaint.getTextSize()		+ "textSize=" + mPaint.getTextSize()
	+ ", textScaleX=" + mPaint.getTextScaleX()		+ ", textScaleX=" + mPaint.getTextScaleX()
	@@ -313,6 +375,7 @@ public class PrecomputedText implements Spannable {
	+ ", textDir=" + mTextDir		+ ", textDir=" + mTextDir
	+ ", breakStrategy=" + mBreakStrategy		+ ", breakStrategy=" + mBreakStrategy
	+ ", hyphenationFrequency=" + mHyphenationFrequency		+ ", hyphenationFrequency=" + mHyphenationFrequency
			+ ", lineBreakStyle=" + lineBreakStyle
	+ "}";		+ "}";
	}		}
	};		};
	@@ -369,7 +432,8 @@ public class PrecomputedText implements Spannable {
	final PrecomputedText.Params hintParams = hintPct.getParams();		final PrecomputedText.Params hintParams = hintPct.getParams();
	final @Params.CheckResultUsableResult int checkResult =		final @Params.CheckResultUsableResult int checkResult =
	hintParams.checkResultUsable(params.mPaint, params.mTextDir,		hintParams.checkResultUsable(params.mPaint, params.mTextDir,
	params.mBreakStrategy, params.mHyphenationFrequency);		params.mBreakStrategy, params.mHyphenationFrequency,
			params.mLineBreakConfig);
	switch (checkResult) {		switch (checkResult) {
	case Params.USABLE:		case Params.USABLE:
	return hintPct;		return hintPct;
	@@ -418,9 +482,9 @@ public class PrecomputedText implements Spannable {
	final int paraStart = pct.getParagraphStart(i);		final int paraStart = pct.getParagraphStart(i);
	final int paraEnd = pct.getParagraphEnd(i);		final int paraEnd = pct.getParagraphEnd(i);
	result.add(new ParagraphInfo(paraEnd, MeasuredParagraph.buildForStaticLayout(		result.add(new ParagraphInfo(paraEnd, MeasuredParagraph.buildForStaticLayout(
	params.getTextPaint(), pct, paraStart, paraEnd, params.getTextDirection(),		params.getTextPaint(), params.getLineBreakConfig(), pct, paraStart, paraEnd,
	hyphenationMode, computeLayout, pct.getMeasuredParagraph(i),		params.getTextDirection(), hyphenationMode, computeLayout,
	null /* no recycle */)));		pct.getMeasuredParagraph(i), null /* no recycle */)));
	}		}
	return result.toArray(new ParagraphInfo[result.size()]);		return result.toArray(new ParagraphInfo[result.size()]);
	}		}
	@@ -456,8 +520,9 @@ public class PrecomputedText implements Spannable {
	}		}

	result.add(new ParagraphInfo(paraEnd, MeasuredParagraph.buildForStaticLayout(		result.add(new ParagraphInfo(paraEnd, MeasuredParagraph.buildForStaticLayout(
	params.getTextPaint(), text, paraStart, paraEnd, params.getTextDirection(),		params.getTextPaint(), params.getLineBreakConfig(), text, paraStart, paraEnd,
	hyphenationMode, computeLayout, null /* no hint /, null / no recycle */)));		params.getTextDirection(), hyphenationMode, computeLayout, null /* no hint */,
			null /* no recycle */)));
	}		}
	return result.toArray(new ParagraphInfo[result.size()]);		return result.toArray(new ParagraphInfo[result.size()]);
	}		}
	@@ -544,11 +609,11 @@ public class PrecomputedText implements Spannable {
	public @Params.CheckResultUsableResult int checkResultUsable(@IntRange(from = 0) int start,		public @Params.CheckResultUsableResult int checkResultUsable(@IntRange(from = 0) int start,
	@IntRange(from = 0) int end, @NonNull TextDirectionHeuristic textDir,		@IntRange(from = 0) int end, @NonNull TextDirectionHeuristic textDir,
	@NonNull TextPaint paint, @Layout.BreakStrategy int strategy,		@NonNull TextPaint paint, @Layout.BreakStrategy int strategy,
	@Layout.HyphenationFrequency int frequency) {		@Layout.HyphenationFrequency int frequency, @NonNull LineBreakConfig lbConfig) {
	if (mStart != start \|\| mEnd != end) {		if (mStart != start \|\| mEnd != end) {
	return Params.UNUSABLE;		return Params.UNUSABLE;
	} else {		} else {
	return mParams.checkResultUsable(paint, textDir, strategy, frequency);		return mParams.checkResultUsable(paint, textDir, strategy, frequency, lbConfig);
	}		}
	}		}

core/java/android/text/StaticLayout.java

+21 −3

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@ import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.compat.annotation.UnsupportedAppUsage;		import android.compat.annotation.UnsupportedAppUsage;
	import android.graphics.Paint;		import android.graphics.Paint;
			import android.graphics.text.LineBreakConfig;
	import android.graphics.text.LineBreaker;		import android.graphics.text.LineBreaker;
	import android.os.Build;		import android.os.Build;
	import android.text.style.LeadingMarginSpan;		import android.text.style.LeadingMarginSpan;
	@@ -402,6 +403,21 @@ public class StaticLayout extends Layout {
	return this;		return this;
	}		}

			/**
			* Set the line break configuration. The line break will be passed to native used for
			* calculating the text wrapping. The default value of the line break style is
			* {@link LineBreakConfig#LINE_BREAK_STYLE_NONE}
			*
			* @param lineBreakConfig the line break configuration for text wrapping.
			* @return this builder, useful for chaining.
			* @see android.widget.TextView#setLineBreakConfig
			*/
			@NonNull
			public Builder setLineBreakConfig(@NonNull LineBreakConfig lineBreakConfig) {
			mLineBreakConfig = lineBreakConfig;
			return this;
			}

	/**		/**
	* Build the {@link StaticLayout} after options have been set.		* Build the {@link StaticLayout} after options have been set.
	*		*
	@@ -438,6 +454,7 @@ public class StaticLayout extends Layout {
	@Nullable private int[] mRightIndents;		@Nullable private int[] mRightIndents;
	private int mJustificationMode;		private int mJustificationMode;
	private boolean mAddLastLineLineSpacing;		private boolean mAddLastLineLineSpacing;
			private LineBreakConfig mLineBreakConfig;

	private final Paint.FontMetricsInt mFontMetricsInt = new Paint.FontMetricsInt();		private final Paint.FontMetricsInt mFontMetricsInt = new Paint.FontMetricsInt();

	@@ -670,7 +687,7 @@ public class StaticLayout extends Layout {
	PrecomputedText precomputed = (PrecomputedText) source;		PrecomputedText precomputed = (PrecomputedText) source;
	final @PrecomputedText.Params.CheckResultUsableResult int checkResult =		final @PrecomputedText.Params.CheckResultUsableResult int checkResult =
	precomputed.checkResultUsable(bufStart, bufEnd, textDir, paint,		precomputed.checkResultUsable(bufStart, bufEnd, textDir, paint,
	b.mBreakStrategy, b.mHyphenationFrequency);		b.mBreakStrategy, b.mHyphenationFrequency, b.mLineBreakConfig);
	switch (checkResult) {		switch (checkResult) {
	case PrecomputedText.Params.UNUSABLE:		case PrecomputedText.Params.UNUSABLE:
	break;		break;
	@@ -680,6 +697,7 @@ public class StaticLayout extends Layout {
	.setBreakStrategy(b.mBreakStrategy)		.setBreakStrategy(b.mBreakStrategy)
	.setHyphenationFrequency(b.mHyphenationFrequency)		.setHyphenationFrequency(b.mHyphenationFrequency)
	.setTextDirection(textDir)		.setTextDirection(textDir)
			.setLineBreakConfig(b.mLineBreakConfig)
	.build();		.build();
	precomputed = PrecomputedText.create(precomputed, newParams);		precomputed = PrecomputedText.create(precomputed, newParams);
	paragraphInfo = precomputed.getParagraphInfo();		paragraphInfo = precomputed.getParagraphInfo();
	@@ -692,8 +710,8 @@ public class StaticLayout extends Layout {
	}		}

	if (paragraphInfo == null) {		if (paragraphInfo == null) {
	final PrecomputedText.Params param = new PrecomputedText.Params(paint, textDir,		final PrecomputedText.Params param = new PrecomputedText.Params(paint,
	b.mBreakStrategy, b.mHyphenationFrequency);		b.mLineBreakConfig, textDir, b.mBreakStrategy, b.mHyphenationFrequency);
	paragraphInfo = PrecomputedText.createMeasuredParagraphs(source, param, bufStart,		paragraphInfo = PrecomputedText.createMeasuredParagraphs(source, param, bufStart,
	bufEnd, false /* computeLayout */);		bufEnd, false /* computeLayout */);
	}		}

core/java/android/widget/TextView.java

+54 −5

File changed.

Preview size limit exceeded, changes collapsed.