Merge "Add fingerprint navigation to enable pulling down the statusbar" into... (e3a46d8e) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41479,6 +41479,10 @@ package android.view {
	field public static final int KEYCODE_FOCUS = 80; // 0x50		field public static final int KEYCODE_FOCUS = 80; // 0x50
	field public static final int KEYCODE_FORWARD = 125; // 0x7d		field public static final int KEYCODE_FORWARD = 125; // 0x7d
	field public static final int KEYCODE_FORWARD_DEL = 112; // 0x70		field public static final int KEYCODE_FORWARD_DEL = 112; // 0x70
			field public static final int KEYCODE_FP_NAV_DOWN = 281; // 0x119
			field public static final int KEYCODE_FP_NAV_LEFT = 282; // 0x11a
			field public static final int KEYCODE_FP_NAV_RIGHT = 283; // 0x11b
			field public static final int KEYCODE_FP_NAV_UP = 280; // 0x118
	field public static final int KEYCODE_FUNCTION = 119; // 0x77		field public static final int KEYCODE_FUNCTION = 119; // 0x77
	field public static final int KEYCODE_G = 35; // 0x23		field public static final int KEYCODE_G = 35; // 0x23
	field public static final int KEYCODE_GRAVE = 68; // 0x44		field public static final int KEYCODE_GRAVE = 68; // 0x44

api/system-current.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -44481,6 +44481,10 @@ package android.view {
	field public static final int KEYCODE_FOCUS = 80; // 0x50		field public static final int KEYCODE_FOCUS = 80; // 0x50
	field public static final int KEYCODE_FORWARD = 125; // 0x7d		field public static final int KEYCODE_FORWARD = 125; // 0x7d
	field public static final int KEYCODE_FORWARD_DEL = 112; // 0x70		field public static final int KEYCODE_FORWARD_DEL = 112; // 0x70
			field public static final int KEYCODE_FP_NAV_DOWN = 281; // 0x119
			field public static final int KEYCODE_FP_NAV_LEFT = 282; // 0x11a
			field public static final int KEYCODE_FP_NAV_RIGHT = 283; // 0x11b
			field public static final int KEYCODE_FP_NAV_UP = 280; // 0x118
	field public static final int KEYCODE_FUNCTION = 119; // 0x77		field public static final int KEYCODE_FUNCTION = 119; // 0x77
	field public static final int KEYCODE_G = 35; // 0x23		field public static final int KEYCODE_G = 35; // 0x23
	field public static final int KEYCODE_GRAVE = 68; // 0x44		field public static final int KEYCODE_GRAVE = 68; // 0x44

api/test-current.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41559,6 +41559,10 @@ package android.view {
	field public static final int KEYCODE_FOCUS = 80; // 0x50		field public static final int KEYCODE_FOCUS = 80; // 0x50
	field public static final int KEYCODE_FORWARD = 125; // 0x7d		field public static final int KEYCODE_FORWARD = 125; // 0x7d
	field public static final int KEYCODE_FORWARD_DEL = 112; // 0x70		field public static final int KEYCODE_FORWARD_DEL = 112; // 0x70
			field public static final int KEYCODE_FP_NAV_DOWN = 281; // 0x119
			field public static final int KEYCODE_FP_NAV_LEFT = 282; // 0x11a
			field public static final int KEYCODE_FP_NAV_RIGHT = 283; // 0x11b
			field public static final int KEYCODE_FP_NAV_UP = 280; // 0x118
	field public static final int KEYCODE_FUNCTION = 119; // 0x77		field public static final int KEYCODE_FUNCTION = 119; // 0x77
	field public static final int KEYCODE_G = 35; // 0x23		field public static final int KEYCODE_G = 35; // 0x23
	field public static final int KEYCODE_GRAVE = 68; // 0x44		field public static final int KEYCODE_GRAVE = 68; // 0x44

core/java/android/view/KeyEvent.java

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -796,8 +796,16 @@ public class KeyEvent extends InputEvent implements Parcelable {
	public static final int KEYCODE_COPY = 278;		public static final int KEYCODE_COPY = 278;
	/** Key code constant: Paste key. */		/** Key code constant: Paste key. */
	public static final int KEYCODE_PASTE = 279;		public static final int KEYCODE_PASTE = 279;
			/** Key code constant: fingerprint navigation up */
			public static final int KEYCODE_FP_NAV_UP = 280;
			/** Key code constant: fingerprint navigation down */
			public static final int KEYCODE_FP_NAV_DOWN = 281;
			/** Key code constant: fingerprint navigation left*/
			public static final int KEYCODE_FP_NAV_LEFT = 282;
			/** Key code constant: fingerprint navigation right */
			public static final int KEYCODE_FP_NAV_RIGHT = 283;

	private static final int LAST_KEYCODE = KEYCODE_PASTE;		private static final int LAST_KEYCODE = KEYCODE_FP_NAV_RIGHT;

	// NOTE: If you add a new keycode here you must also add it to:		// NOTE: If you add a new keycode here you must also add it to:
	// isSystem()		// isSystem()
	@@ -1844,6 +1852,10 @@ public class KeyEvent extends InputEvent implements Parcelable {
	case KeyEvent.KEYCODE_BRIGHTNESS_DOWN:		case KeyEvent.KEYCODE_BRIGHTNESS_DOWN:
	case KeyEvent.KEYCODE_BRIGHTNESS_UP:		case KeyEvent.KEYCODE_BRIGHTNESS_UP:
	case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK:		case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK:
			case KeyEvent.KEYCODE_FP_NAV_UP:
			case KeyEvent.KEYCODE_FP_NAV_DOWN:
			case KeyEvent.KEYCODE_FP_NAV_LEFT:
			case KeyEvent.KEYCODE_FP_NAV_RIGHT:
	return true;		return true;
	}		}

core/res/res/values/attrs.xml

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1835,6 +1835,10 @@ i
	<enum name="KEYCODE_CUT" value="277" />		<enum name="KEYCODE_CUT" value="277" />
	<enum name="KEYCODE_COPY" value="278" />		<enum name="KEYCODE_COPY" value="278" />
	<enum name="KEYCODE_PASTE" value="279" />		<enum name="KEYCODE_PASTE" value="279" />
			<enum name="KEYCODE_FP_NAV_UP" value="280" />
			<enum name="KEYCODE_FP_NAV_DOWN" value="281" />
			<enum name="KEYCODE_FP_NAV_LEFT" value="282" />
			<enum name="KEYCODE_FP_NAV_RIGHT" value="283" />
	</attr>		</attr>

	<!-- ***************************************************************** -->		<!-- ***************************************************************** -->