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

am 484de9db: Merge "Fix for bug 6954231 text wraps on second line and is fused..." into jb-mr1-dev

Browse Source 
* commit '484de9db7c4044588929f11673906fea205e409b':
  Fix for bug 6954231 text wraps on second line and is fused...
This commit is contained in:
Raph Levien
2012-10-03 12:09:50 -07:00
committed by Android Git Automerger
parent f4c51434e7 484de9db7c
commit e9b175b713
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/Editor.java
View File

@@ -122,6 +122,7 @@ public class Editor {
InputMethodState mInputMethodState;
DisplayList[] mTextDisplayLists;
int mLastLayoutHeight;
boolean mFrozenWithFocus;
boolean mSelectionMoved;
@@ -1258,6 +1259,16 @@ public class Editor {
mTextDisplayLists = new DisplayList[ArrayUtils.idealObjectArraySize(0)];
}
// If the height of the layout changes (usually when inserting or deleting a line,
// but could be changes within a span), invalidate everything. We could optimize
// more aggressively (for example, adding offsets to blocks) but it would be more
// complex and we would only get the benefit in some cases.
int layoutHeight = layout.getHeight();
if (mLastLayoutHeight != layoutHeight) {
invalidateTextDisplayList();
mLastLayoutHeight = layoutHeight;
}
DynamicLayout dynamicLayout = (DynamicLayout) layout;
int[] blockEndLines = dynamicLayout.getBlockEndLines();
int[] blockIndices = dynamicLayout.getBlockIndices();