Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88ac4e04 authored Jun 03, 2015 by Raph Levien Committed by Android (Google) Code Review Jun 03, 2015

Merge "Rename setTextDir to setTextDirection" into mnc-dev

parents cd45913f a6a08286

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -32455,7 +32455,7 @@ package android.text {
		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);
		method public android.text.StaticLayout.Builder setTextDir(android.text.TextDirectionHeuristic);
		method public android.text.StaticLayout.Builder setTextDirection(android.text.TextDirectionHeuristic);
		}

		public abstract interface TextDirectionHeuristic {

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -34720,7 +34720,7 @@ package android.text {
		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);
		method public android.text.StaticLayout.Builder setTextDir(android.text.TextDirectionHeuristic);
		method public android.text.StaticLayout.Builder setTextDirection(android.text.TextDirectionHeuristic);
		}

		public abstract interface TextDirectionHeuristic {

core/java/android/text/DynamicLayout.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -291,7 +291,7 @@ public class DynamicLayout extends Layout
		b.setText(text, where, where + after)
		.setPaint(getPaint())
		.setWidth(getWidth())
		.setTextDir(getTextDirectionHeuristic())
		.setTextDirection(getTextDirectionHeuristic())
		.setLineSpacing(getSpacingAdd(), getSpacingMultiplier())
		.setEllipsizedWidth(mEllipsizedWidth)
		.setEllipsize(mEllipsizeAt)

core/java/android/text/StaticLayout.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -184,7 +184,7 @@ public class StaticLayout extends Layout {
		* @param textDir text direction heuristic for resolving BiDi behavior.
		* @return this builder, useful for chaining
		*/
		public Builder setTextDir(TextDirectionHeuristic textDir) {
		public Builder setTextDirection(TextDirectionHeuristic textDir) {
		mTextDir = textDir;
		return this;
		}
		@@ -473,7 +473,7 @@ public class StaticLayout extends Layout {

		Builder b = Builder.obtain(source, bufstart, bufend, paint, outerwidth)
		.setAlignment(align)
		.setTextDir(textDir)
		.setTextDirection(textDir)
		.setLineSpacing(spacingadd, spacingmult)
		.setIncludePad(includepad)
		.setEllipsizedWidth(ellipsizedWidth)

core/java/android/widget/TextView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -6680,7 +6680,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		StaticLayout.Builder builder = StaticLayout.Builder.obtain(mHint, 0,
		mHint.length(), mTextPaint, hintWidth)
		.setAlignment(alignment)
		.setTextDir(mTextDir)
		.setTextDirection(mTextDir)
		.setLineSpacing(mSpacingAdd, mSpacingMult)
		.setIncludePad(mIncludePad)
		.setBreakStrategy(mBreakStrategy)
		@@ -6771,7 +6771,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		StaticLayout.Builder builder = StaticLayout.Builder.obtain(mTransformed,
		0, mTransformed.length(), mTextPaint, wantWidth)
		.setAlignment(alignment)
		.setTextDir(mTextDir)
		.setTextDirection(mTextDir)
		.setLineSpacing(mSpacingAdd, mSpacingMult)
		.setIncludePad(mIncludePad)
		.setBreakStrategy(mBreakStrategy)