Merge "Make KEYCODE_SPACE a confirm key." (e5f4a9c1) · Commits · e / os / android_frameworks_base

core/java/android/view/KeyEvent.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1779,6 +1779,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
		switch (keyCode) {
		case KeyEvent.KEYCODE_DPAD_CENTER:
		case KeyEvent.KEYCODE_ENTER:
		case KeyEvent.KEYCODE_SPACE:
		return true;
		default:
		return false;

+2 −2

Original line number	Diff line number	Diff line
		@@ -10162,8 +10162,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		/**
		* Default implementation of {@link KeyEvent.Callback#onKeyUp(int, KeyEvent)
		* KeyEvent.Callback.onKeyUp()}: perform clicking of the view
		* when {@link KeyEvent#KEYCODE_DPAD_CENTER} or
		* {@link KeyEvent#KEYCODE_ENTER} is released.
		* when {@link KeyEvent#KEYCODE_DPAD_CENTER}, {@link KeyEvent#KEYCODE_ENTER}
		* or {@link KeyEvent#KEYCODE_SPACE} is released.
		* <p>Key presses in software keyboards will generally NOT trigger this listener,
		* although some may elect to do so in some situations. Do not rely on this to
		* catch software key presses.

+9 −23

Original line number	Diff line number	Diff line
		@@ -1643,8 +1643,16 @@ public class GridView extends AbsListView {

		boolean handled = false;
		int action = event.getAction();
		if (KeyEvent.isConfirmKey(keyCode)
		&& event.hasNoModifiers() && action == KeyEvent.ACTION_UP) {
		handled = resurrectSelectionIfNeeded();
		if (!handled && event.getRepeatCount() == 0 && getChildCount() > 0) {
		keyPressed();
		handled = true;
		}
		}

		if (action != KeyEvent.ACTION_UP) {
		if (!handled && action != KeyEvent.ACTION_UP) {
		switch (keyCode) {
		case KeyEvent.KEYCODE_DPAD_LEFT:
		if (event.hasNoModifiers()) {
		@@ -1674,28 +1682,6 @@ public class GridView extends AbsListView {
		}
		break;

		case KeyEvent.KEYCODE_DPAD_CENTER:
		case KeyEvent.KEYCODE_ENTER:
		if (event.hasNoModifiers()) {
		handled = resurrectSelectionIfNeeded();
		if (!handled
		&& event.getRepeatCount() == 0 && getChildCount() > 0) {
		keyPressed();
		handled = true;
		}
		}
		break;

		case KeyEvent.KEYCODE_SPACE:
		if (mPopup == null \|\| !mPopup.isShowing()) {
		if (event.hasNoModifiers()) {
		handled = resurrectSelectionIfNeeded() \|\| pageScroll(FOCUS_DOWN);
		} else if (event.hasModifiers(KeyEvent.META_SHIFT_ON)) {
		handled = resurrectSelectionIfNeeded() \|\| pageScroll(FOCUS_UP);
		}
		}
		break;

		case KeyEvent.KEYCODE_PAGE_UP:
		if (event.hasNoModifiers()) {
		handled = resurrectSelectionIfNeeded() \|\| pageScroll(FOCUS_UP);

+10 −24

Original line number	Diff line number	Diff line
		@@ -2180,8 +2180,17 @@ public class ListView extends AbsListView {

		boolean handled = false;
		int action = event.getAction();
		if (KeyEvent.isConfirmKey(keyCode)
		&& event.hasNoModifiers() && action == KeyEvent.ACTION_UP) {
		handled = resurrectSelectionIfNeeded();
		if (!handled && event.getRepeatCount() == 0 && getChildCount() > 0) {
		keyPressed();
		handled = true;
		}
		}


		if (action != KeyEvent.ACTION_UP) {
		if (!handled && action != KeyEvent.ACTION_UP) {
		switch (keyCode) {
		case KeyEvent.KEYCODE_DPAD_UP:
		if (event.hasNoModifiers()) {
		@@ -2229,29 +2238,6 @@ public class ListView extends AbsListView {
		}
		break;

		case KeyEvent.KEYCODE_DPAD_CENTER:
		case KeyEvent.KEYCODE_ENTER:
		if (event.hasNoModifiers()) {
		handled = resurrectSelectionIfNeeded();
		if (!handled
		&& event.getRepeatCount() == 0 && getChildCount() > 0) {
		keyPressed();
		handled = true;
		}
		}
		break;

		case KeyEvent.KEYCODE_SPACE:
		if (mPopup == null \|\| !mPopup.isShowing()) {
		if (event.hasNoModifiers()) {
		handled = resurrectSelectionIfNeeded() \|\| pageScroll(FOCUS_DOWN);
		} else if (event.hasModifiers(KeyEvent.META_SHIFT_ON)) {
		handled = resurrectSelectionIfNeeded() \|\| pageScroll(FOCUS_UP);
		}
		handled = true;
		}
		break;

		case KeyEvent.KEYCODE_PAGE_UP:
		if (event.hasNoModifiers()) {
		handled = resurrectSelectionIfNeeded() \|\| pageScroll(FOCUS_UP);