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

am d6991106: Merge "Avert crash when dragging text in same TextView" into jb-mr1-dev

Browse Source 
* commit 'd6991106b02760749b974a2e369f72b2e0eed5a0':
  Avert crash when dragging text in same TextView
This commit is contained in:
Victoria Lease
2012-09-17 15:10:23 -07:00
committed by Android Git Automerger
parent 97b927a665 d6991106b0
commit 976ed4711e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1801,13 +1801,13 @@ public class Editor {
mTextView.deleteText_internal(dragSourceStart, dragSourceEnd); mTextView.deleteText_internal(dragSourceStart, dragSourceEnd);
// Make sure we do not leave two adjacent spaces. // Make sure we do not leave two adjacent spaces.
CharSequence t = mTextView.getTransformedText(dragSourceStart - 1, dragSourceStart + 1); final int prevCharIdx = Math.max(0, dragSourceStart - 1);
if ( (dragSourceStart == 0 || Character.isSpaceChar(t.charAt(0))) && final int nextCharIdx = Math.min(mTextView.getText().length(), dragSourceStart + 1);
(dragSourceStart == mTextView.getText().length() || if (nextCharIdx > prevCharIdx + 1) {
Character.isSpaceChar(t.charAt(1))) ) { CharSequence t = mTextView.getTransformedText(prevCharIdx, nextCharIdx);
final int pos = dragSourceStart == mTextView.getText().length() ? if (Character.isSpaceChar(t.charAt(0)) && Character.isSpaceChar(t.charAt(1))) {
dragSourceStart - 1 : dragSourceStart; mTextView.deleteText_internal(prevCharIdx, prevCharIdx + 1);
mTextView.deleteText_internal(pos, pos + 1); }
} }
} }
} }