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

Merge "Fix for Text fading on RTL app names is done at the beginning..." into klp-dev

Browse Source
This commit is contained in:
Raph Levien
2013-09-26 23:31:48 +00:00
committed by Android (Google) Code Review
parent aaf0f83c69 8079ae1a2d
commit adf149029f
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7838,7 +7838,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
getCompoundPaddingLeft() - getCompoundPaddingRight() -
mLayout.getLineLeft(0)) / getHorizontalFadingEdgeLength();
case Gravity.CENTER_HORIZONTAL:
return 0.0f;
case Gravity.FILL_HORIZONTAL:
final int textDirection = mLayout.getParagraphDirection(0);
if (textDirection == Layout.DIR_LEFT_TO_RIGHT) {
return 0.0f;
} else {
return (mLayout.getLineRight(0) - (mRight - mLeft) -
getCompoundPaddingLeft() - getCompoundPaddingRight() -
mLayout.getLineLeft(0)) / getHorizontalFadingEdgeLength();
}
}
}
}
@@ -7867,9 +7875,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return 0.0f;
case Gravity.CENTER_HORIZONTAL:
case Gravity.FILL_HORIZONTAL:
return (mLayout.getLineWidth(0) - ((mRight - mLeft) -
final int textDirection = mLayout.getParagraphDirection(0);
if (textDirection == Layout.DIR_RIGHT_TO_LEFT) {
return 0.0f;
} else {
return (mLayout.getLineWidth(0) - ((mRight - mLeft) -
getCompoundPaddingLeft() - getCompoundPaddingRight())) /
getHorizontalFadingEdgeLength();
}
}
}
}