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

am 85e9092d: am 88ac4e04: Merge "Rename setTextDir to setTextDirection" into mnc-dev

Browse Source 
* commit '85e9092decddc5a0da43ecbd22ef2d3292daca4d':
  Rename setTextDir to setTextDirection
This commit is contained in:
Raph Levien
2015-06-03 23:32:17 +00:00
committed by Android Git Automerger
parent a115bffa1e 85e9092dec
commit 7f374287c4
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)

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.
* @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)

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,
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)