Merge "Move copy, cut and paste shortcut handler to onKeyDown()." (00112e6f) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+20 −19

Original line number	Diff line number	Diff line
		@@ -8057,6 +8057,26 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}
		}
		break;

		case KeyEvent.KEYCODE_FORWARD_DEL:
		if (event.hasModifiers(KeyEvent.META_SHIFT_ON) && canCut()) {
		if (onTextContextMenuItem(ID_CUT)) {
		return KEY_EVENT_HANDLED;
		}
		}
		break;

		case KeyEvent.KEYCODE_INSERT:
		if (event.hasModifiers(KeyEvent.META_CTRL_ON) && canCopy()) {
		if (onTextContextMenuItem(ID_COPY)) {
		return KEY_EVENT_HANDLED;
		}
		} else if (event.hasModifiers(KeyEvent.META_SHIFT_ON) && canPaste()) {
		if (onTextContextMenuItem(ID_PASTE)) {
		return KEY_EVENT_HANDLED;
		}
		}
		break;
		}

		if (mEditor != null && mEditor.mKeyListener != null) {
		@@ -10827,25 +10847,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		return onTextContextMenuItem(ID_PASTE);
		}
		break;
		case KeyEvent.KEYCODE_INSERT:
		if (canCopy()) {
		return onTextContextMenuItem(ID_COPY);
		}
		break;
		}
		} else if (event.hasModifiers(KeyEvent.META_SHIFT_ON)) {
		// Handle Shift-only shortcuts.
		switch (keyCode) {
		case KeyEvent.KEYCODE_FORWARD_DEL:
		if (canCut()) {
		return onTextContextMenuItem(ID_CUT);
		}
		break;
		case KeyEvent.KEYCODE_INSERT:
		if (canPaste()) {
		return onTextContextMenuItem(ID_PASTE);
		}
		break;
		}
		} else if (event.hasModifiers(KeyEvent.META_CTRL_ON \| KeyEvent.META_SHIFT_ON)) {
		// Handle Ctrl-Shift shortcuts.