drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 47fa8e80: Fix for an IndentOutOfBounds in TextField.

Browse Source 
Merge commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4' into gingerbread-plus-aosp

* commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4':
  Fix for an IndentOutOfBounds in TextField.
This commit is contained in:
Gilles Debunne
2010-09-09 12:14:59 -07:00
committed by Android Git Automerger
parent ca1b261509 47fa8e800c
commit 2b88c5c70d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6504,6 +6504,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (!mFrozenWithFocus || (selStart < 0 || selEnd < 0)) {
// Has to be done before onTakeFocus, which can be overloaded.
if (mLastTouchOffset >= 0) {
// Can happen when a TextView is displayed after its content has been deleted.
mLastTouchOffset = Math.min(mLastTouchOffset, mText.length());
Selection.setSelection((Spannable) mText, mLastTouchOffset);
}
@ -6520,7 +6522,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// ExtractEditText clears focus, which gives focus to the ExtractEditText.
// This special case ensure that we keep current selection in that case.
// It would be better to know why the DecorView does not have focus at that time.
if (((this instanceof ExtractEditText) || mSelectionMoved) && selStart >= 0 && selEnd >= 0) {
if (((this instanceof ExtractEditText) || mSelectionMoved) &&
selStart >= 0 && selEnd >= 0) {
/*
* Someone intentionally set the selection, so let them
* do whatever it is that they wanted to do instead of