From a6a082862b9e2ea4c9e9a1a945927c4040993f6e Mon Sep 17 00:00:00 2001 From: Raph Levien Date: Wed, 3 Jun 2015 13:20:45 -0700 Subject: Rename setTextDir to setTextDirection StaticLayout.Builder used "setTextDir" as a shorthand, but it's not as clear as spelling it out. So, setTextDirection. Bug: 21572282 Change-Id: Ia94476562d70678f963196b87bb63511d30836b6 --- api/current.txt | 2 +- api/system-current.txt | 2 +- core/java/android/text/DynamicLayout.java | 2 +- core/java/android/text/StaticLayout.java | 4 ++-- core/java/android/widget/TextView.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/current.txt b/api/current.txt index e1c83e563723..633ae1a45093 100644 --- a/api/current.txt +++ b/api/current.txt @@ -32456,7 +32456,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 { diff --git a/api/system-current.txt b/api/system-current.txt index 2839f68093cc..3d8d44f5880f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -34721,7 +34721,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 { diff --git a/core/java/android/text/DynamicLayout.java b/core/java/android/text/DynamicLayout.java index e99a960fb473..5b5cdd243eee 100644 --- a/core/java/android/text/DynamicLayout.java +++ b/core/java/android/text/DynamicLayout.java @@ -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) diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index d6d046be30a8..464710b29d2a 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -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) diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index e14e39c6d41f..3a854767e383 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -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) -- cgit v1.2.3-59-g8ed1b