Merge "Add a builder for DynamicLayout and switch TextView to it" (612e6732) · Commits · e / os / android_frameworks_base

api/current.txt

+17 −0

Original line number	Diff line number	Diff line
		@@ -41401,6 +41401,21 @@ package android.text {
		method public int getTopPadding();
		}

		public static final class DynamicLayout.Builder {
		method public android.text.DynamicLayout build();
		method public static android.text.DynamicLayout.Builder obtain(java.lang.CharSequence, android.text.TextPaint, int);
		method public android.text.DynamicLayout.Builder setAlignment(android.text.Layout.Alignment);
		method public android.text.DynamicLayout.Builder setBreakStrategy(int);
		method public android.text.DynamicLayout.Builder setDisplayText(java.lang.CharSequence);
		method public android.text.DynamicLayout.Builder setEllipsize(android.text.TextUtils.TruncateAt);
		method public android.text.DynamicLayout.Builder setEllipsizedWidth(int);
		method public android.text.DynamicLayout.Builder setHyphenationFrequency(int);
		method public android.text.DynamicLayout.Builder setIncludePad(boolean);
		method public android.text.DynamicLayout.Builder setJustificationMode(int);
		method public android.text.DynamicLayout.Builder setLineSpacing(float, float);
		method public android.text.DynamicLayout.Builder setTextDirection(android.text.TextDirectionHeuristic);
		}

		public abstract interface Editable implements java.lang.Appendable java.lang.CharSequence android.text.GetChars android.text.Spannable {
		method public abstract android.text.Editable append(java.lang.CharSequence);
		method public abstract android.text.Editable append(java.lang.CharSequence, int, int);
		@@ -41565,6 +41580,8 @@ package android.text {
		field public static final int BREAK_STRATEGY_BALANCED = 2; // 0x2
		field public static final int BREAK_STRATEGY_HIGH_QUALITY = 1; // 0x1
		field public static final int BREAK_STRATEGY_SIMPLE = 0; // 0x0
		field public static final float DEFAULT_LINESPACING_ADDITION = 0.0f;
		field public static final float DEFAULT_LINESPACING_MULTIPLIER = 1.0f;
		field public static final int DIR_LEFT_TO_RIGHT = 1; // 0x1
		field public static final int DIR_RIGHT_TO_LEFT = -1; // 0xffffffff
		field public static final int HYPHENATION_FREQUENCY_FULL = 2; // 0x2

api/system-current.txt

+17 −0

Original line number	Diff line number	Diff line
		@@ -45005,6 +45005,21 @@ package android.text {
		method public int getTopPadding();
		}

		public static final class DynamicLayout.Builder {
		method public android.text.DynamicLayout build();
		method public static android.text.DynamicLayout.Builder obtain(java.lang.CharSequence, android.text.TextPaint, int);
		method public android.text.DynamicLayout.Builder setAlignment(android.text.Layout.Alignment);
		method public android.text.DynamicLayout.Builder setBreakStrategy(int);
		method public android.text.DynamicLayout.Builder setDisplayText(java.lang.CharSequence);
		method public android.text.DynamicLayout.Builder setEllipsize(android.text.TextUtils.TruncateAt);
		method public android.text.DynamicLayout.Builder setEllipsizedWidth(int);
		method public android.text.DynamicLayout.Builder setHyphenationFrequency(int);
		method public android.text.DynamicLayout.Builder setIncludePad(boolean);
		method public android.text.DynamicLayout.Builder setJustificationMode(int);
		method public android.text.DynamicLayout.Builder setLineSpacing(float, float);
		method public android.text.DynamicLayout.Builder setTextDirection(android.text.TextDirectionHeuristic);
		}

		public abstract interface Editable implements java.lang.Appendable java.lang.CharSequence android.text.GetChars android.text.Spannable {
		method public abstract android.text.Editable append(java.lang.CharSequence);
		method public abstract android.text.Editable append(java.lang.CharSequence, int, int);
		@@ -45169,6 +45184,8 @@ package android.text {
		field public static final int BREAK_STRATEGY_BALANCED = 2; // 0x2
		field public static final int BREAK_STRATEGY_HIGH_QUALITY = 1; // 0x1
		field public static final int BREAK_STRATEGY_SIMPLE = 0; // 0x0
		field public static final float DEFAULT_LINESPACING_ADDITION = 0.0f;
		field public static final float DEFAULT_LINESPACING_MULTIPLIER = 1.0f;
		field public static final int DIR_LEFT_TO_RIGHT = 1; // 0x1
		field public static final int DIR_RIGHT_TO_LEFT = -1; // 0xffffffff
		field public static final int HYPHENATION_FREQUENCY_FULL = 2; // 0x2

api/test-current.txt

+17 −0

Original line number	Diff line number	Diff line
		@@ -41665,6 +41665,21 @@ package android.text {
		method public int getTopPadding();
		}

		public static final class DynamicLayout.Builder {
		method public android.text.DynamicLayout build();
		method public static android.text.DynamicLayout.Builder obtain(java.lang.CharSequence, android.text.TextPaint, int);
		method public android.text.DynamicLayout.Builder setAlignment(android.text.Layout.Alignment);
		method public android.text.DynamicLayout.Builder setBreakStrategy(int);
		method public android.text.DynamicLayout.Builder setDisplayText(java.lang.CharSequence);
		method public android.text.DynamicLayout.Builder setEllipsize(android.text.TextUtils.TruncateAt);
		method public android.text.DynamicLayout.Builder setEllipsizedWidth(int);
		method public android.text.DynamicLayout.Builder setHyphenationFrequency(int);
		method public android.text.DynamicLayout.Builder setIncludePad(boolean);
		method public android.text.DynamicLayout.Builder setJustificationMode(int);
		method public android.text.DynamicLayout.Builder setLineSpacing(float, float);
		method public android.text.DynamicLayout.Builder setTextDirection(android.text.TextDirectionHeuristic);
		}

		public abstract interface Editable implements java.lang.Appendable java.lang.CharSequence android.text.GetChars android.text.Spannable {
		method public abstract android.text.Editable append(java.lang.CharSequence);
		method public abstract android.text.Editable append(java.lang.CharSequence, int, int);
		@@ -41829,6 +41844,8 @@ package android.text {
		field public static final int BREAK_STRATEGY_BALANCED = 2; // 0x2
		field public static final int BREAK_STRATEGY_HIGH_QUALITY = 1; // 0x1
		field public static final int BREAK_STRATEGY_SIMPLE = 0; // 0x0
		field public static final float DEFAULT_LINESPACING_ADDITION = 0.0f;
		field public static final float DEFAULT_LINESPACING_MULTIPLIER = 1.0f;
		field public static final int DIR_LEFT_TO_RIGHT = 1; // 0x1
		field public static final int DIR_RIGHT_TO_LEFT = -1; // 0xffffffff
		field public static final int HYPHENATION_FREQUENCY_FULL = 2; // 0x2

core/java/android/text/DynamicLayout.java

+356 −82

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/text/Layout.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,16 @@ public abstract class Layout {
		*/
		public static final int JUSTIFICATION_MODE_INTER_WORD = 1;

		/*
		* Line spacing multiplier for default line spacing.
		*/
		public static final float DEFAULT_LINESPACING_MULTIPLIER = 1.0f;

		/*
		* Line spacing addition for default line spacing.
		*/
		public static final float DEFAULT_LINESPACING_ADDITION = 0.0f;

		/**
		* Return how wide a layout must be in order to display the specified text with one line per
		* paragraph.