Merge "Deprecate StaticLayout and DynamicLayout constructors" (df392c9a) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -41910,9 +41910,9 @@ package android.text {
		}

		public class DynamicLayout extends android.text.Layout {
		ctor public DynamicLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean);
		ctor public DynamicLayout(java.lang.CharSequence, java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean);
		ctor public DynamicLayout(java.lang.CharSequence, java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean, android.text.TextUtils.TruncateAt, int);
		ctor public deprecated DynamicLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean);
		ctor public deprecated DynamicLayout(java.lang.CharSequence, java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean);
		ctor public deprecated DynamicLayout(java.lang.CharSequence, java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean, android.text.TextUtils.TruncateAt, int);
		method public int getBottomPadding();
		method public int getEllipsisCount(int);
		method public int getEllipsisStart(int);
		@@ -42299,9 +42299,9 @@ package android.text {
		}

		public class StaticLayout extends android.text.Layout {
		ctor public StaticLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean);
		ctor public StaticLayout(java.lang.CharSequence, int, int, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean);
		ctor public StaticLayout(java.lang.CharSequence, int, int, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean, android.text.TextUtils.TruncateAt, int);
		ctor public deprecated StaticLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean);
		ctor public deprecated StaticLayout(java.lang.CharSequence, int, int, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean);
		ctor public deprecated StaticLayout(java.lang.CharSequence, int, int, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean, android.text.TextUtils.TruncateAt, int);
		method public int getBottomPadding();
		method public int getEllipsisCount(int);
		method public int getEllipsisStart(int);

core/java/android/text/DynamicLayout.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -42,8 +42,7 @@ import java.lang.ref.WeakReference;
		* {@link android.graphics.Canvas#drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint)
		* Canvas.drawText()} directly.</p>
		*/
		public class DynamicLayout extends Layout
		{
		public class DynamicLayout extends Layout {
		private static final int PRIORITY = 128;
		private static final int BLOCK_MINIMUM_CHARACTER_LENGTH = 400;

		@@ -303,8 +302,9 @@ public class DynamicLayout extends Layout
		}

		/**
		* Make a layout for the specified text that will be updated as the text is changed.
		* @deprecated Use {@link Builder} instead.
		*/
		@Deprecated
		public DynamicLayout(@NonNull CharSequence base,
		@NonNull TextPaint paint,
		@IntRange(from = 0) int width, @NonNull Alignment align,
		@@ -315,9 +315,9 @@ public class DynamicLayout extends Layout
		}

		/**
		* Make a layout for the transformed text (password transformation being the primary example of
		* a transformation) that will be updated as the base text is changed.
		* @deprecated Use {@link Builder} instead.
		*/
		@Deprecated
		public DynamicLayout(@NonNull CharSequence base, @NonNull CharSequence display,
		@NonNull TextPaint paint,
		@IntRange(from = 0) int width, @NonNull Alignment align,
		@@ -328,10 +328,9 @@ public class DynamicLayout extends Layout
		}

		/**
		* Make a layout for the transformed text (password transformation being the primary example of
		* a transformation) that will be updated as the base text is changed. If ellipsize is non-null,
		* the Layout will ellipsize the text down to ellipsizedWidth.
		* @deprecated Use {@link Builder} instead.
		*/
		@Deprecated
		public DynamicLayout(@NonNull CharSequence base, @NonNull CharSequence display,
		@NonNull TextPaint paint,
		@IntRange(from = 0) int width, @NonNull Alignment align,
		@@ -351,7 +350,9 @@ public class DynamicLayout extends Layout
		* the Layout will ellipsize the text down to ellipsizedWidth.
		*
		* @hide
		* @deprecated Use {@link Builder} instead.
		*/
		@Deprecated
		public DynamicLayout(@NonNull CharSequence base, @NonNull CharSequence display,
		@NonNull TextPaint paint,
		@IntRange(from = 0) int width,

core/java/android/text/StaticLayout.java

+13 −19

Original line number	Diff line number	Diff line
		@@ -454,6 +454,10 @@ public class StaticLayout extends Layout {
		private static final SynchronizedPool<Builder> sPool = new SynchronizedPool<>(3);
		}

		/**
		* @deprecated Use {@link Builder} instead.
		*/
		@Deprecated
		public StaticLayout(CharSequence source, TextPaint paint,
		int width,
		Alignment align, float spacingmult, float spacingadd,
		@@ -463,16 +467,9 @@ public class StaticLayout extends Layout {
		}

		/**
		* @hide
		* @deprecated Use {@link Builder} instead.
		*/
		public StaticLayout(CharSequence source, TextPaint paint,
		int width, Alignment align, TextDirectionHeuristic textDir,
		float spacingmult, float spacingadd,
		boolean includepad) {
		this(source, 0, source.length(), paint, width, align, textDir,
		spacingmult, spacingadd, includepad);
		}

		@Deprecated
		public StaticLayout(CharSequence source, int bufstart, int bufend,
		TextPaint paint, int outerwidth,
		Alignment align,
		@@ -483,17 +480,9 @@ public class StaticLayout extends Layout {
		}

		/**
		* @hide
		* @deprecated Use {@link Builder} instead.
		*/
		public StaticLayout(CharSequence source, int bufstart, int bufend,
		TextPaint paint, int outerwidth,
		Alignment align, TextDirectionHeuristic textDir,
		float spacingmult, float spacingadd,
		boolean includepad) {
		this(source, bufstart, bufend, paint, outerwidth, align, textDir,
		spacingmult, spacingadd, includepad, null, 0, Integer.MAX_VALUE);
		}

		@Deprecated
		public StaticLayout(CharSequence source, int bufstart, int bufend,
		TextPaint paint, int outerwidth,
		Alignment align,
		@@ -507,7 +496,9 @@ public class StaticLayout extends Layout {

		/**
		* @hide
		* @deprecated Use {@link Builder} instead.
		*/
		@Deprecated
		public StaticLayout(CharSequence source, int bufstart, int bufend,
		TextPaint paint, int outerwidth,
		Alignment align, TextDirectionHeuristic textDir,
		@@ -565,6 +556,9 @@ public class StaticLayout extends Layout {
		Builder.recycle(b);
		}

		/**
		* Used by DynamicLayout.
		*/
		/* package */ StaticLayout(@Nullable CharSequence text) {
		super(text, null, 0, null, 0, 0);

core/tests/coretests/src/android/text/StaticLayoutTest.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -697,9 +697,13 @@ public class StaticLayoutTest {
		public void testGetOffset_UNICODE_Hebrew() {
		String testString = "\u05DE\u05E1\u05E2\u05D3\u05D4"; // Hebrew Characters
		for (CharSequence seq: buildTestCharSequences(testString, Normalizer.Form.values())) {
		StaticLayout layout = new StaticLayout(seq, mDefaultPaint,
		DEFAULT_OUTER_WIDTH, DEFAULT_ALIGN,
		TextDirectionHeuristics.RTL, SPACE_MULTI, SPACE_ADD, true);
		StaticLayout.Builder b = StaticLayout.Builder.obtain(
		seq, 0, seq.length(), mDefaultPaint, DEFAULT_OUTER_WIDTH)
		.setAlignment(DEFAULT_ALIGN)
		.setTextDirection(TextDirectionHeuristics.RTL)
		.setLineSpacing(SPACE_ADD, SPACE_MULTI)
		.setIncludePad(true);
		StaticLayout layout = b.build();

		String testLabel = buildTestMessage(seq);