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

am 671b2a57: Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread

Browse Source 
Merge commit '671b2a57bb5a2a8669d1dabe65b4080804ee350a' into gingerbread-plus-aosp

* commit '671b2a57bb5a2a8669d1dabe65b4080804ee350a':
  Fix for IndexOutOfBounds in text pasting.
This commit is contained in:
Gilles Debunne
2010-10-05 18:15:12 -07:00
committed by Android Git Automerger
parent ce2e2184bb 671b2a57bb
commit ba04dbc6cd
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7490,16 +7490,23 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (Character.isSpaceChar(paste.charAt(0))) { if (Character.isSpaceChar(paste.charAt(0))) {
if (min > 0 && Character.isSpaceChar(mTransformed.charAt(min - 1))) { if (min > 0 && Character.isSpaceChar(mTransformed.charAt(min - 1))) {
// Two spaces at beginning of paste: remove one // Two spaces at beginning of paste: remove one
final int originalLength = mText.length();
((Editable) mText).replace(min - 1, min, ""); ((Editable) mText).replace(min - 1, min, "");
min = min - 1; // Due to filters, there is no garantee that exactly one character was
max = max - 1; // removed. Count instead.
final int delta = mText.length() - originalLength;
min += delta;
max += delta;
} }
} else { } else {
if (min > 0 && !Character.isSpaceChar(mTransformed.charAt(min - 1))) { if (min > 0 && !Character.isSpaceChar(mTransformed.charAt(min - 1))) {
// No space at beginning of paste: add one // No space at beginning of paste: add one
final int originalLength = mText.length();
((Editable) mText).replace(min, min, " "); ((Editable) mText).replace(min, min, " ");
min = min + 1; // Taking possible filters into account as above.
max = max + 1; final int delta = mText.length() - originalLength;
min += delta;
max += delta;
} }
} }