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

am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev

Browse Source 
automerge: be1ad50

* commit 'be1ad50b34e160c5d490d1165a590eb4c633d996':
  Fudge clipRect in TextView for extra cursor width
This commit is contained in:
Raph Levien
2014-11-14 21:50:37 +00:00
committed by android-build-merger
parent b536c7a693 be1ad50b34
commit 2d20850525
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5369,9 +5369,13 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
final int vspace = mBottom - mTop - compoundPaddingBottom - compoundPaddingTop;
final int maxScrollY = mLayout.getHeight() - vspace;
// Add sufficient space for cursor and tone marks
int cursorWidth = 2 + (int)mTextPaint.density; // adequate for Material cursors
int fudgedPaddingRight = Math.max(0, compoundPaddingRight - (cursorWidth - 1));
float clipLeft = compoundPaddingLeft + scrollX;
float clipTop = (scrollY == 0) ? 0 : extendedPaddingTop + scrollY;
float clipRight = right - left - compoundPaddingRight + scrollX;
float clipRight = right - left - fudgedPaddingRight + scrollX;
float clipBottom = bottom - top + scrollY -
((scrollY == maxScrollY) ? 0 : extendedPaddingBottom);