Merge "Annotate APIs with appropriate flags" into main (98a787a4) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -46675,10 +46675,10 @@ package android.text {
		method @NonNull public android.text.DynamicLayout.Builder setHyphenationFrequency(int);
		method @NonNull public android.text.DynamicLayout.Builder setIncludePad(boolean);
		method @NonNull public android.text.DynamicLayout.Builder setJustificationMode(int);
		method @NonNull public android.text.DynamicLayout.Builder setLineBreakConfig(@NonNull android.graphics.text.LineBreakConfig);
		method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public android.text.DynamicLayout.Builder setLineBreakConfig(@NonNull android.graphics.text.LineBreakConfig);
		method @NonNull public android.text.DynamicLayout.Builder setLineSpacing(float, @FloatRange(from=0.0) float);
		method @NonNull public android.text.DynamicLayout.Builder setTextDirection(@NonNull android.text.TextDirectionHeuristic);
		method @NonNull public android.text.DynamicLayout.Builder setUseBoundsForWidth(boolean);
		method @FlaggedApi("com.android.text.flags.use_bounds_for_width") @NonNull public android.text.DynamicLayout.Builder setUseBoundsForWidth(boolean);
		method @NonNull public android.text.DynamicLayout.Builder setUseLineSpacingFromFallbacks(boolean);
		}

		@@ -47202,7 +47202,7 @@ package android.text {
		method @NonNull public android.text.StaticLayout.Builder setMaxLines(@IntRange(from=0) int);
		method public android.text.StaticLayout.Builder setText(CharSequence);
		method @NonNull public android.text.StaticLayout.Builder setTextDirection(@NonNull android.text.TextDirectionHeuristic);
		method @NonNull public android.text.StaticLayout.Builder setUseBoundsForWidth(boolean);
		method @FlaggedApi("com.android.text.flags.use_bounds_for_width") @NonNull public android.text.StaticLayout.Builder setUseBoundsForWidth(boolean);
		method @NonNull public android.text.StaticLayout.Builder setUseLineSpacingFromFallbacks(boolean);
		}

core/api/test-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -3283,12 +3283,12 @@ package android.text {
		}

		public class MeasuredParagraph {
		method @NonNull public static android.text.MeasuredParagraph buildForStaticLayoutTest(@NonNull android.text.TextPaint, @Nullable android.graphics.text.LineBreakConfig, @NonNull CharSequence, @IntRange(from=0) int, @IntRange(from=0) int, @NonNull android.text.TextDirectionHeuristic, int, boolean, @Nullable android.text.MeasuredParagraph.StyleRunCallback);
		method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public static android.text.MeasuredParagraph buildForStaticLayoutTest(@NonNull android.text.TextPaint, @Nullable android.graphics.text.LineBreakConfig, @NonNull CharSequence, @IntRange(from=0) int, @IntRange(from=0) int, @NonNull android.text.TextDirectionHeuristic, int, boolean, @Nullable android.text.MeasuredParagraph.StyleRunCallback);
		}

		public static interface MeasuredParagraph.StyleRunCallback {
		method public void onAppendReplacementRun(@NonNull android.graphics.Paint, @IntRange(from=0) int, @FloatRange(from=0) @Px float);
		method public void onAppendStyleRun(@NonNull android.graphics.Paint, @Nullable android.graphics.text.LineBreakConfig, @IntRange(from=0) int, boolean);
		@FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static interface MeasuredParagraph.StyleRunCallback {
		method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public void onAppendReplacementRun(@NonNull android.graphics.Paint, @IntRange(from=0) int, @FloatRange(from=0) @Px float);
		method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public void onAppendStyleRun(@NonNull android.graphics.Paint, @Nullable android.graphics.text.LineBreakConfig, @IntRange(from=0) int, boolean);
		}

		public static final class Selection.MemoryTextWatcher implements android.text.TextWatcher {

core/java/android/text/DynamicLayout.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,10 @@

		package android.text;

		import static com.android.text.flags.Flags.FLAG_NO_BREAK_NO_HYPHENATION_SPAN;
		import static com.android.text.flags.Flags.FLAG_USE_BOUNDS_FOR_WIDTH;

		import android.annotation.FlaggedApi;
		import android.annotation.FloatRange;
		import android.annotation.IntRange;
		import android.annotation.NonNull;
		@@ -280,6 +284,7 @@ public class DynamicLayout extends Layout {
		* @see android.widget.TextView#setLineBreakWordStyle
		*/
		@NonNull
		@FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN)
		public Builder setLineBreakConfig(@NonNull LineBreakConfig lineBreakConfig) {
		mLineBreakConfig = lineBreakConfig;
		return this;
		@@ -303,6 +308,7 @@ public class DynamicLayout extends Layout {
		* @see Layout.Builder#setUseBoundsForWidth(boolean)
		*/
		@NonNull
		@FlaggedApi(FLAG_USE_BOUNDS_FOR_WIDTH)
		public Builder setUseBoundsForWidth(boolean useBoundsForWidth) {
		mUseBoundsForWidth = useBoundsForWidth;
		return this;

core/java/android/text/MeasuredParagraph.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		package android.text;

		import static com.android.text.flags.Flags.FLAG_NO_BREAK_NO_HYPHENATION_SPAN;

		import android.annotation.FlaggedApi;
		import android.annotation.FloatRange;
		import android.annotation.IntRange;
		import android.annotation.NonNull;
		@@ -416,10 +419,12 @@ public class MeasuredParagraph {
		* @hide
		*/
		@TestApi
		@FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN)
		public interface StyleRunCallback {
		/**
		* Called when a single style run is identified.
		*/
		@FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN)
		void onAppendStyleRun(@NonNull Paint paint,
		@Nullable LineBreakConfig lineBreakConfig, @IntRange(from = 0) int length,
		boolean isRtl);
		@@ -427,6 +432,7 @@ public class MeasuredParagraph {
		/**
		* Called when a single replacement run is identified.
		*/
		@FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN)
		void onAppendReplacementRun(@NonNull Paint paint,
		@IntRange(from = 0) int length, @Px @FloatRange(from = 0) float width);
		}
		@@ -488,6 +494,7 @@ public class MeasuredParagraph {
		@SuppressLint("ExecutorRegistration")
		@TestApi
		@NonNull
		@FlaggedApi(FLAG_NO_BREAK_NO_HYPHENATION_SPAN)
		public static MeasuredParagraph buildForStaticLayoutTest(
		@NonNull TextPaint paint,
		@Nullable LineBreakConfig lineBreakConfig,

core/java/android/text/StaticLayout.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		package android.text;

		import static com.android.text.flags.Flags.FLAG_USE_BOUNDS_FOR_WIDTH;

		import android.annotation.FlaggedApi;
		import android.annotation.FloatRange;
		import android.annotation.IntRange;
		import android.annotation.NonNull;
		@@ -439,6 +442,7 @@ public class StaticLayout extends Layout {
		* @see Layout.Builder#setUseBoundsForWidth(boolean)
		*/
		@NonNull
		@FlaggedApi(FLAG_USE_BOUNDS_FOR_WIDTH)
		public Builder setUseBoundsForWidth(boolean useBoundsForWidth) {
		mUseBoundsForWidth = useBoundsForWidth;
		return this;