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

Merge "Lazily create the paste popup window."

Browse Source
This commit is contained in:
Gilles Debunne
2010-11-24 14:49:04 -08:00
committed by Android (Google) Code Review
parent 8af253a81b 2880294cc6
commit d9d618ffbc
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8258,6 +8258,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
private int mLastParentY;
private int mContainerPositionX, mContainerPositionY;
private long mTouchTimer;
private boolean mHasPastePopupWindow = false;
private PastePopupMenu mPastePopupWindow;
public static final int LEFT = 0;
@@ -8310,7 +8311,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mDrawable = mSelectHandleCenter;
handleWidth = mDrawable.getIntrinsicWidth();
mHotspotX = handleWidth / 2;
mPastePopupWindow = new PastePopupMenu();
mHasPastePopupWindow = true;
break;
}
}
@@ -8478,9 +8479,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mLastParentX = coords[0];
mLastParentY = coords[1];
mIsDragging = true;
if (mPastePopupWindow != null) {
if (mHasPastePopupWindow) {
mTouchTimer = SystemClock.uptimeMillis();
if (mPastePopupWindow.isShowing()) {
if (mPastePopupWindow != null && mPastePopupWindow.isShowing()) {
// Tapping on the handle again dismisses the displayed paste view,
mPastePopupWindow.hide();
// and makes sure the action up does not display the paste view.
@@ -8548,7 +8549,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
void showPastePopupWindow() {
if (mPastePopupWindow != null) {
if (mHasPastePopupWindow) {
if (mPastePopupWindow == null) {
// Lazy initialisation: create when actually shown only.
mPastePopupWindow = new PastePopupMenu();
}
mPastePopupWindow.show();
}
}