Merge "Add plumbing for volume mute key." (b0bb949f) · Commits · e / os / android_frameworks_native

include/ui/KeycodeLabels.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -188,6 +188,7 @@ static const KeycodeLabel KEYCODES[] = {
		{ "NUMPAD_EQUALS", 161 },
		{ "NUMPAD_LEFT_PAREN", 162 },
		{ "NUMPAD_RIGHT_PAREN", 163 },
		{ "VOLUME_MUTE", 164 },

		// NOTE: If you add a new keycode here you must also add it to several other files.
		// Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

+8 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ bool KeyEvent::hasDefaultAction(int32_t keyCode) {
		case AKEYCODE_ENDCALL:
		case AKEYCODE_VOLUME_UP:
		case AKEYCODE_VOLUME_DOWN:
		case AKEYCODE_VOLUME_MUTE:
		case AKEYCODE_POWER:
		case AKEYCODE_CAMERA:
		case AKEYCODE_HEADSETHOOK:
		@@ -40,11 +41,14 @@ bool KeyEvent::hasDefaultAction(int32_t keyCode) {
		case AKEYCODE_NOTIFICATION:
		case AKEYCODE_FOCUS:
		case AKEYCODE_SEARCH:
		case AKEYCODE_MEDIA_PLAY:
		case AKEYCODE_MEDIA_PAUSE:
		case AKEYCODE_MEDIA_PLAY_PAUSE:
		case AKEYCODE_MEDIA_STOP:
		case AKEYCODE_MEDIA_NEXT:
		case AKEYCODE_MEDIA_PREVIOUS:
		case AKEYCODE_MEDIA_REWIND:
		case AKEYCODE_MEDIA_RECORD:
		case AKEYCODE_MEDIA_FAST_FORWARD:
		case AKEYCODE_MUTE:
		return true;
		@@ -67,14 +71,18 @@ bool KeyEvent::isSystemKey(int32_t keyCode) {
		case AKEYCODE_ENDCALL:
		case AKEYCODE_VOLUME_UP:
		case AKEYCODE_VOLUME_DOWN:
		case AKEYCODE_VOLUME_MUTE:
		case AKEYCODE_MUTE:
		case AKEYCODE_POWER:
		case AKEYCODE_HEADSETHOOK:
		case AKEYCODE_MEDIA_PLAY:
		case AKEYCODE_MEDIA_PAUSE:
		case AKEYCODE_MEDIA_PLAY_PAUSE:
		case AKEYCODE_MEDIA_STOP:
		case AKEYCODE_MEDIA_NEXT:
		case AKEYCODE_MEDIA_PREVIOUS:
		case AKEYCODE_MEDIA_REWIND:
		case AKEYCODE_MEDIA_RECORD:
		case AKEYCODE_MEDIA_FAST_FORWARD:
		case AKEYCODE_CAMERA:
		case AKEYCODE_FOCUS: