Merge "Patches for the Paste window behavior." into honeycomb (0ad4f096) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7364,7 +7364,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

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

	@@ -9035,6 +9038,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

	if (offset != previousOffset) {		if (offset != previousOffset) {
	updateOffset(handle, offset);		updateOffset(handle, offset);
			removePastePopupCallback();
	}		}
	hideDelayed();		hideDelayed();
	}		}