summaryrefslogtreecommitdiff
path: root/core/java/android/widget
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-11-30 10:31:08 -0800
committerGilles Debunne <debunne@google.com>2010-11-30 12:11:15 -0800
commitd803cdef9a3d41d26fbc39aceec94f15199f56e6 (patch)
tree1f2459ff950b048fb6b87a5ff9d3c8c21908ae7a /core/java/android/widget
parent6f72bebe92a4db7b5dc83f4ac5b5fd02e3b4e2cd (diff)
Selection handles no longer fade out.
This fade out was mainly introduced for forms with selectAllOnFocus fields, where is hide some content. These no longer trigger selection mode and hence do not display the handles. Handles will be visible as long as selection mode goes on. Change-Id: Ib8c2cc97308a91722f69aa0bb0caccb21d94c2c4
Diffstat (limited to 'core/java/android/widget')
-rw-r--r--core/java/android/widget/TextView.java24
1 files changed, 0 insertions, 24 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index a46427864383..39a2d94caec3 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7010,11 +7010,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (start >= prevStart && start < prevEnd) {
// Restore previous selection
Selection.setSelection((Spannable)mText, prevStart, prevEnd);
-
- if (hasSelectionController()) {
- // Revive the anchors.
- getSelectionController().show();
- }
return;
} else {
// Tapping outside stops selection mode, if any
@@ -8679,14 +8674,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
private int mPreviousTapPositionX;
private int mPreviousTapPositionY;
- private static final int DELAY_BEFORE_FADE_OUT = 4100;
-
- private final Runnable mHider = new Runnable() {
- public void run() {
- hide();
- }
- };
-
SelectionModifierCursorController() {
resetTouchOffsets();
}
@@ -8707,19 +8694,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mEndHandle.show();
hideInsertionPointCursorController();
- hideDelayed();
}
public void hide() {
if (mStartHandle != null) mStartHandle.hide();
if (mEndHandle != null) mEndHandle.hide();
mIsShowing = false;
- removeCallbacks(mHider);
- }
-
- private void hideDelayed() {
- removeCallbacks(mHider);
- postDelayed(mHider, DELAY_BEFORE_FADE_OUT);
}
public boolean isShowing() {
@@ -8762,7 +8742,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
Selection.setSelection((Spannable) mText, selectionStart, selectionEnd);
updatePosition();
- hideDelayed();
}
public void updatePosition() {
@@ -8808,9 +8787,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
final int slopSquared = doubleTapSlop * doubleTapSlop;
if (distanceSquared < slopSquared) {
startSelectionActionMode();
- // Hacky: onTapUpEvent will open a context menu with cut/copy
- // Prevent this by hiding handles which will be revived instead.
- hide();
}
}