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

am 0ad4f096: Merge "Patches for the Paste window behavior." into honeycomb

Browse Source 
* commit '0ad4f0963a47feafaaa92a756fb84caab5b6bddb':
  Patches for the Paste window behavior.
This commit is contained in:
Gilles Debunne
2011-01-31 18:30:42 -08:00
committed by Android Git Automerger
parent 36dad9b86c 0ad4f0963a
commit d4155ae607
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

@@ -7364,7 +7364,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
stopSelectionActionMode();
boolean selectAllGotFocus = mSelectAllOnFocus && mTouchFocusSelected;
if (hasInsertionController() && !selectAllGotFocus) {
if (hasInsertionController() && !selectAllGotFocus && mText.length() > 0) {
getInsertionController().show();
}
}
@@ -8887,6 +8887,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mLastParentX = coords[0];
mLastParentY = coords[1];
mIsDragging = true;
if (mIsInsertionHandle) {
mTouchTimer = SystemClock.uptimeMillis();
}
break;
}
@@ -9035,6 +9038,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (offset != previousOffset) {
updateOffset(handle, offset);
removePastePopupCallback();
}
hideDelayed();
}