Merge "Make View onKeyUp symmetric with onKeyDown." into klp-dev (26267660) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+12 −19

Original line number	Diff line number	Diff line
		@@ -8008,7 +8008,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		public boolean onKeyDown(int keyCode, KeyEvent event) {
		boolean result = false;

		if (KeyEvent.isConfirmKey(event.getKeyCode())) {
		if (KeyEvent.isConfirmKey(keyCode)) {
		if ((mViewFlags & ENABLED_MASK) == DISABLED) {
		return true;
		}
		@@ -8050,11 +8050,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @param event The KeyEvent object that defines the button action.
		*/
		public boolean onKeyUp(int keyCode, KeyEvent event) {
		boolean result = false;

		switch (keyCode) {
		case KeyEvent.KEYCODE_DPAD_CENTER:
		case KeyEvent.KEYCODE_ENTER: {
		if (KeyEvent.isConfirmKey(keyCode)) {
		if ((mViewFlags & ENABLED_MASK) == DISABLED) {
		return true;
		}
		@@ -8064,14 +8060,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		if (!mHasPerformedLongPress) {
		// This is a tap, so remove the longpress check
		removeLongPressCallback();

		result = performClick();
		return performClick();
		}
		}
		break;
		}
		}
		return result;
		return false;
		}

		/**