Commit Graph

17 Commits

Author SHA1 Message Date
Steve Kondik
a98331d1ae Android 6.0.1 release 22
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlbd4TYACgkQ6K0/gZqxDnjOhgCfYccuq5Zsd00z9ml+jdBXyBqa
 WQwAnRujr2d4u9bKGKGcUbAJC54CXsM9
 =YI3s
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/native into cm-13.0

Android 6.0.1 release 22
2016-03-10 18:17:45 -08:00
Ricardo Cerqueira
1cdd1b5ad2 Android 6.0.0 release 26
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgIACgkQ6K0/gZqxDnjCqACfbBT6VOiUFQvRn7w1SAa+4rjF
 1IwAn2rBUqWo0dOKVwF1DDfFmGZXc8SB
 =1BqV
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

Conflicts:
	include/android/input.h

Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b
2015-11-05 01:41:42 +00:00
nadlabak
c1c5240aa9 Support WAKE flag in keyboard layouts
This flag is used to specify the internal keyboard keys allowed
to wake the device.

Change-Id: Ic15aca1134206c9b006a4d97dded10bccae640d3
2015-10-17 14:03:58 -07:00
Michael Wright
a16b98c64f DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"
This reverts commit 9b70ab7a3cb260205e81e40ba181a86710d2eb95, reversing
changes made to 153008efb5a00ed3c18d588ce15f90d2442a9786.

Bug: 24302031

Change-Id: Ia746381b30be3b54cb646ed412b7271962c4b02a
2015-09-22 22:05:48 +01:00
Nick Armstrong-Crews
a180e855f6 Add KEYCODE_SOFT_SLEEP for Ungaze.
BUG: b/23589870
Change-Id: I9bb575fe97bfae926ef4db37615e88057b81480c
2015-09-02 13:00:52 -07:00
Michael Wright
1362ec74fc Merge commit '62ec2dd5' into mm
Change-Id: I34801df36735545fc500486209573ed2864a0430
2015-08-07 18:12:20 +01:00
Michael Wright
62ec2dd563 DO NOT MERGE Add new media navigation keys.
Bug: 22059484
Change-Id: I587eb7622555194f18f403da583e3b70656a530e
2015-08-07 14:46:16 +01:00
Anthony Hugh
887b00dd28 Introduce stem keycodes for Wear
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch.  There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.

BUG: 21903503
Change-Id: I60f87f027fa4d4b19933d96b4110019805b30895
2015-06-24 13:26:55 -07:00
Joseph Cooper
e50376eef0 Introduces navigation keycodes.
These four new navigation keycodes are intended to be used to
navigate a tree hierarchy or list of items.  They should be used to
allow the user to advance forward or backward within a list of
sibling items, expand the currently selected item to navigate the
item's children, or back out from the current item to its parent
item or state.

Change-Id: I4781e9d7756ed00ca14d8d4c743da3cc0e68ea6c
2015-04-16 09:09:17 -07:00
Jeff Brown
c9aa628d06 Cancel touch events when a low-level touch gesture occurs.
When the touch firmware or driver sends a key event that is triggered
by a low-level gesture such as a palm slap.  For this to work, the
touch device's .kl file must specify the "GESTURE" flag for each
key that is produced by a gesture.

Note that the "VIRTUAL" flag should also be specified for any such
keys for which we would like to generate haptic feedback.

eg. key 142   SLEEP   VIRTUAL GESTURE

Bug: 19264992
Change-Id: Ief494ec7e3ca66d2358a1001fdfae4f263ee1cd1
2015-02-12 11:27:24 -08:00
ASAZU, Hideki
5b3dc861fb New keycode definitions for TV remotes.
Keys which are necessary for supporting world-wide broadcast
standard or used commonly for TV/STB remotes.

Change-Id: I2721ceb7d956c87f1d4106b99f9d21947ae13d47
2014-09-02 13:48:25 -07:00
Michael Wright
51409573be Add Voice Assist key.
Bug: 16292420
Change-Id: I607fadc2edf673079bfd9f7406e6e45603474957
2014-08-21 19:09:49 -07:00
Jeff Brown
b9e879d429 Merge "Support VIRTUAL flag in keyboard layouts." 2014-05-21 02:34:36 +00:00
Jeff Brown
5a7d2f9a15 Support VIRTUAL flag in keyboard layouts.
This flag is used to provide haptic feedback for virtual hard keys.

Bug: 14319563
Change-Id: Ia0ca1acc8cfa00a42d1c04d279dfa59c6cc00f4d
2014-05-20 17:29:30 -07:00
Jinsuk Kim
bc4e396d17 New keycode definitions for HDMI-CEC
Following keys are added to be mapped to HDMI-CEC standard keys:

KEYCODE_MEDIA_TOP_MENU
KEYCODE_11
KEYCODE_12
KEYCODE_LAST_CHANNEL
KEYCODE_TV_DATA_SERVICE

Change-Id: Ie73cf4cd8355ced4753eb5bba0ea130b087dfc36
2014-05-20 07:51:18 +09:00
Tim Kilbourn
6b4e02f1cb Add KEYCODE_PAIRING.
Used for initiating a peripheral pairing mode.

Change-Id: I7e8439d27491ccc72d045cabf5751a35b9113aa7
2014-05-16 15:36:11 -07:00
Michael Wright
872db4f11e Move key attribute information out of native.
Native doesn't ever actually care about the attributes of keys, so
move all of it up into the managed layer and move all of the key
names down so they're defined once.

Change-Id: Ic8ded13ce050b2b98744735ff50d11e8d882d7d5
2014-04-22 16:55:36 -07:00