Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename setTextDir to setTextDirection" into mnc-dev

Browse Source
This commit is contained in:
Raph Levien
2015-06-03 23:09:47 +00:00
committed by Android (Google) Code Review
parent cd45913fe3 a6a082862b
commit 88ac4e04a5
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -32455,7 +32455,7 @@ package android.text {
method public android.text.StaticLayout.Builder setLineSpacing(float, float); method public android.text.StaticLayout.Builder setLineSpacing(float, float);
method public android.text.StaticLayout.Builder setMaxLines(int); method public android.text.StaticLayout.Builder setMaxLines(int);
method public android.text.StaticLayout.Builder setText(java.lang.CharSequence); 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 { public abstract interface TextDirectionHeuristic {

2
api/system-current.txt
View File

@@ -34720,7 +34720,7 @@ package android.text {
method public android.text.StaticLayout.Builder setLineSpacing(float, float); method public android.text.StaticLayout.Builder setLineSpacing(float, float);
method public android.text.StaticLayout.Builder setMaxLines(int); method public android.text.StaticLayout.Builder setMaxLines(int);
method public android.text.StaticLayout.Builder setText(java.lang.CharSequence); 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 { public abstract interface TextDirectionHeuristic {

2
core/java/android/text/DynamicLayout.java
View File

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

4
core/java/android/text/StaticLayout.java
View File

@@ -184,7 +184,7 @@ public class StaticLayout extends Layout {
* @param textDir text direction heuristic for resolving BiDi behavior. * @param textDir text direction heuristic for resolving BiDi behavior.
* @return this builder, useful for chaining * @return this builder, useful for chaining
*/ */
public Builder setTextDir(TextDirectionHeuristic textDir) { public Builder setTextDirection(TextDirectionHeuristic textDir) {
mTextDir = textDir; mTextDir = textDir;
return this; return this;
} }
@@ -473,7 +473,7 @@ public class StaticLayout extends Layout {
Builder b = Builder.obtain(source, bufstart, bufend, paint, outerwidth) Builder b = Builder.obtain(source, bufstart, bufend, paint, outerwidth)
.setAlignment(align) .setAlignment(align)
.setTextDir(textDir) .setTextDirection(textDir)
.setLineSpacing(spacingadd, spacingmult) .setLineSpacing(spacingadd, spacingmult)
.setIncludePad(includepad) .setIncludePad(includepad)
.setEllipsizedWidth(ellipsizedWidth) .setEllipsizedWidth(ellipsizedWidth)

4
core/java/android/widget/TextView.java
View File

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