diff options
| author | Gilles Debunne <debunne@google.com> | 2010-08-27 10:49:00 -0700 |
|---|---|---|
| committer | Gilles Debunne <debunne@google.com> | 2010-08-27 10:49:14 -0700 |
| commit | d2420248faa261d596028ffe1593cdc8afd81e45 (patch) | |
| tree | 55165e455f0895bb0f3832a8db6317f31ea2c48d /core/java/android/widget/TextView.java | |
| parent | 45b2d699e10474f0167691774c0cfb93cfe2dae9 (diff) | |
| download | frameworks_base-d2420248faa261d596028ffe1593cdc8afd81e45.zip frameworks_base-d2420248faa261d596028ffe1593cdc8afd81e45.tar.gz frameworks_base-d2420248faa261d596028ffe1593cdc8afd81e45.tar.bz2 | |
DO NOT MERGE Removed "Stop selecting text" option.
Change-Id: Ic553d099664d1703a39139e7440d583cfec20d76
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 6f35b61..d1a14d2 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4304,7 +4304,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return 0; } break; - + + // Has to be done on key down (and not on key up) to correctly be intercepted. case KeyEvent.KEYCODE_BACK: if (mIsInTextSelectionMode) { stopTextSelectionMode(); @@ -4464,6 +4465,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return super.onKeyUp(keyCode, event); } + break; } if (mInput != null) @@ -7330,7 +7332,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener // Context menu entries private static final int ID_SELECT_ALL = android.R.id.selectAll; private static final int ID_START_SELECTING_TEXT = android.R.id.startSelectingText; - private static final int ID_STOP_SELECTING_TEXT = android.R.id.stopSelectingText; private static final int ID_CUT = android.R.id.cut; private static final int ID_COPY = android.R.id.copy; private static final int ID_PASTE = android.R.id.paste; @@ -7377,10 +7378,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener startTextSelectionMode(); return true; - case ID_STOP_SELECTING_TEXT: - stopTextSelectionMode(); - return true; - case ID_CUT: clip.setText(mTransformed.subSequence(min, max)); ((Editable) mText).delete(min, max); |