Merge "Change justification parameter from boolean to int." into oc-dev am: 04fc05cd66 (05c4205a) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −3

Original line number	Diff line number	Diff line
		@@ -41213,6 +41213,8 @@ package android.text {
		field public static final int HYPHENATION_FREQUENCY_FULL = 2; // 0x2
		field public static final int HYPHENATION_FREQUENCY_NONE = 0; // 0x0
		field public static final int HYPHENATION_FREQUENCY_NORMAL = 1; // 0x1
		field public static final int JUSTIFICATION_MODE_INTER_WORD = 1; // 0x1
		field public static final int JUSTIFICATION_MODE_NONE = 0; // 0x0
		}

		public static final class Layout.Alignment extends java.lang.Enum {
		@@ -41414,7 +41416,7 @@ package android.text {
		method public android.text.StaticLayout.Builder setHyphenationFrequency(int);
		method public android.text.StaticLayout.Builder setIncludePad(boolean);
		method public android.text.StaticLayout.Builder setIndents(int[], int[]);
		method public android.text.StaticLayout.Builder setJustify(boolean);
		method public android.text.StaticLayout.Builder setJustificationMode(int);
		method public android.text.StaticLayout.Builder setLineSpacing(float, float);
		method public android.text.StaticLayout.Builder setMaxLines(int);
		method public android.text.StaticLayout.Builder setText(java.lang.CharSequence);
		@@ -51226,7 +51228,7 @@ package android.widget {
		method public boolean getIncludeFontPadding();
		method public android.os.Bundle getInputExtras(boolean);
		method public int getInputType();
		method public boolean getJustify();
		method public int getJustificationMode();
		method public final android.text.method.KeyListener getKeyListener();
		method public final android.text.Layout getLayout();
		method public float getLetterSpacing();
		@@ -51339,7 +51341,7 @@ package android.widget {
		method public void setIncludeFontPadding(boolean);
		method public void setInputExtras(int) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public void setInputType(int);
		method public void setJustify(boolean);
		method public void setJustificationMode(int);
		method public void setKeyListener(android.text.method.KeyListener);
		method public void setLetterSpacing(float);
		method public void setLineSpacing(float, float);

api/system-current.txt

+5 −3

Original line number	Diff line number	Diff line
		@@ -44713,6 +44713,8 @@ package android.text {
		field public static final int HYPHENATION_FREQUENCY_FULL = 2; // 0x2
		field public static final int HYPHENATION_FREQUENCY_NONE = 0; // 0x0
		field public static final int HYPHENATION_FREQUENCY_NORMAL = 1; // 0x1
		field public static final int JUSTIFICATION_MODE_INTER_WORD = 1; // 0x1
		field public static final int JUSTIFICATION_MODE_NONE = 0; // 0x0
		}

		public static final class Layout.Alignment extends java.lang.Enum {
		@@ -44914,7 +44916,7 @@ package android.text {
		method public android.text.StaticLayout.Builder setHyphenationFrequency(int);
		method public android.text.StaticLayout.Builder setIncludePad(boolean);
		method public android.text.StaticLayout.Builder setIndents(int[], int[]);
		method public android.text.StaticLayout.Builder setJustify(boolean);
		method public android.text.StaticLayout.Builder setJustificationMode(int);
		method public android.text.StaticLayout.Builder setLineSpacing(float, float);
		method public android.text.StaticLayout.Builder setMaxLines(int);
		method public android.text.StaticLayout.Builder setText(java.lang.CharSequence);
		@@ -55094,7 +55096,7 @@ package android.widget {
		method public boolean getIncludeFontPadding();
		method public android.os.Bundle getInputExtras(boolean);
		method public int getInputType();
		method public boolean getJustify();
		method public int getJustificationMode();
		method public final android.text.method.KeyListener getKeyListener();
		method public final android.text.Layout getLayout();
		method public float getLetterSpacing();
		@@ -55207,7 +55209,7 @@ package android.widget {
		method public void setIncludeFontPadding(boolean);
		method public void setInputExtras(int) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public void setInputType(int);
		method public void setJustify(boolean);
		method public void setJustificationMode(int);
		method public void setKeyListener(android.text.method.KeyListener);
		method public void setLetterSpacing(float);
		method public void setLineSpacing(float, float);

api/test-current.txt

+5 −3

Original line number	Diff line number	Diff line
		@@ -41422,6 +41422,8 @@ package android.text {
		field public static final int HYPHENATION_FREQUENCY_FULL = 2; // 0x2
		field public static final int HYPHENATION_FREQUENCY_NONE = 0; // 0x0
		field public static final int HYPHENATION_FREQUENCY_NORMAL = 1; // 0x1
		field public static final int JUSTIFICATION_MODE_INTER_WORD = 1; // 0x1
		field public static final int JUSTIFICATION_MODE_NONE = 0; // 0x0
		}

		public static final class Layout.Alignment extends java.lang.Enum {
		@@ -41623,7 +41625,7 @@ package android.text {
		method public android.text.StaticLayout.Builder setHyphenationFrequency(int);
		method public android.text.StaticLayout.Builder setIncludePad(boolean);
		method public android.text.StaticLayout.Builder setIndents(int[], int[]);
		method public android.text.StaticLayout.Builder setJustify(boolean);
		method public android.text.StaticLayout.Builder setJustificationMode(int);
		method public android.text.StaticLayout.Builder setLineSpacing(float, float);
		method public android.text.StaticLayout.Builder setMaxLines(int);
		method public android.text.StaticLayout.Builder setText(java.lang.CharSequence);
		@@ -51618,7 +51620,7 @@ package android.widget {
		method public boolean getIncludeFontPadding();
		method public android.os.Bundle getInputExtras(boolean);
		method public int getInputType();
		method public boolean getJustify();
		method public int getJustificationMode();
		method public final android.text.method.KeyListener getKeyListener();
		method public final android.text.Layout getLayout();
		method public float getLetterSpacing();
		@@ -51731,7 +51733,7 @@ package android.widget {
		method public void setIncludeFontPadding(boolean);
		method public void setInputExtras(int) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public void setInputType(int);
		method public void setJustify(boolean);
		method public void setJustificationMode(int);
		method public void setKeyListener(android.text.method.KeyListener);
		method public void setLetterSpacing(float);
		method public void setLineSpacing(float, float);

core/java/android/text/DynamicLayout.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ public class DynamicLayout extends Layout
		this(base, display, paint, width, align, TextDirectionHeuristics.FIRSTSTRONG_LTR,
		spacingmult, spacingadd, includepad,
		StaticLayout.BREAK_STRATEGY_SIMPLE, StaticLayout.HYPHENATION_FREQUENCY_NONE,
		false /* justify */, ellipsize, ellipsizedWidth);
		Layout.JUSTIFICATION_MODE_NONE, ellipsize, ellipsizedWidth);
		}

		/**
		@@ -102,7 +102,7 @@ public class DynamicLayout extends Layout
		int width, Alignment align, TextDirectionHeuristic textDir,
		float spacingmult, float spacingadd,
		boolean includepad, int breakStrategy, int hyphenationFrequency,
		boolean justify, TextUtils.TruncateAt ellipsize,
		int justificationMode, TextUtils.TruncateAt ellipsize,
		int ellipsizedWidth) {
		super((ellipsize == null)
		? display
		@@ -128,7 +128,7 @@ public class DynamicLayout extends Layout

		mIncludePad = includepad;
		mBreakStrategy = breakStrategy;
		mJustify = justify;
		mJustificationMode = justificationMode;
		mHyphenationFrequency = hyphenationFrequency;

		/*
		@@ -303,7 +303,7 @@ public class DynamicLayout extends Layout
		.setEllipsize(mEllipsizeAt)
		.setBreakStrategy(mBreakStrategy)
		.setHyphenationFrequency(mHyphenationFrequency)
		.setJustify(mJustify);
		.setJustificationMode(mJustificationMode);
		reflowed.generate(b, false, true);
		int n = reflowed.getLineCount();
		// If the new layout has a blank line at the end, but it is not
		@@ -811,7 +811,7 @@ public class DynamicLayout extends Layout
		private TextUtils.TruncateAt mEllipsizeAt;
		private int mBreakStrategy;
		private int mHyphenationFrequency;
		private boolean mJustify;
		private int mJustificationMode;

		private PackedIntVector mInts;
		private PackedObjectVector<Directions> mObjects;

core/java/android/text/Layout.java

+19 −4

Original line number	Diff line number	Diff line
		@@ -103,6 +103,21 @@ public abstract class Layout {
		private static final ParagraphStyle[] NO_PARA_SPANS =
		ArrayUtils.emptyArray(ParagraphStyle.class);

		/** @hide */
		@IntDef({JUSTIFICATION_MODE_NONE, JUSTIFICATION_MODE_INTER_WORD})
		@Retention(RetentionPolicy.SOURCE)
		public @interface JustificationMode {}

		/**
		* Value for justification mode indicating no justification.
		*/
		public static final int JUSTIFICATION_MODE_NONE = 0;

		/**
		* Value for justification mode indicating the text is justified by stretching word spacing.
		*/
		public static final int JUSTIFICATION_MODE_INTER_WORD = 1;

		/**
		* Return how wide a layout must be in order to display the specified text with one line per
		* paragraph.
		@@ -219,8 +234,8 @@ public abstract class Layout {
		}

		/** @hide */
		protected void setJustify(boolean justify) {
		mJustify = justify;
		protected void setJustificationMode(@JustificationMode int justificationMode) {
		mJustificationMode = justificationMode;
		}

		/**
		@@ -272,7 +287,7 @@ public abstract class Layout {
		}

		private boolean isJustificationRequired(int lineNum) {
		if (!mJustify) return false;
		if (mJustificationMode == JUSTIFICATION_MODE_NONE) return false;
		final int lineEnd = getLineEnd(lineNum);
		return lineEnd < mText.length() && mText.charAt(lineEnd - 1) != '\n';
		}
		@@ -2229,7 +2244,7 @@ public abstract class Layout {
		private boolean mSpannedText;
		private TextDirectionHeuristic mTextDir;
		private SpanSet<LineBackgroundSpan> mLineBackgroundSpans;
		private boolean mJustify;
		private int mJustificationMode;

		public static final int DIR_LEFT_TO_RIGHT = 1;
		public static final int DIR_RIGHT_TO_LEFT = -1;