Ian Pedowitz
159a5c3372
Revert "Track ashmem memory usage in Parcel"
...
am: 6880307e8e
2015-10-22 22:32:07 +00:00
Ian Pedowitz
6880307e8e
Revert "Track ashmem memory usage in Parcel"
...
This reverts commit e2f499fb73
2015-10-22 22:09:16 +00:00
Adrian Roos
a0c1be2617
Track ashmem memory usage in Parcel
...
am: e2f499fb73
2015-10-22 00:49:15 +00:00
Adrian Roos
e2f499fb73
Track ashmem memory usage in Parcel
...
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
2015-10-21 22:32:35 +00:00
Adam Lesinski
76fc5f18e6
am 16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
...
* commit '16b0ae105e4e94ff09d1517b68f7c66f2022a19e':
add number constraint for samples per MotionEvent
2015-10-12 22:23:05 +00:00
Adam Lesinski
16b0ae105e
Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
2015-10-12 22:15:50 +00:00
Flanker
552a8a5d8d
add number constraint for samples per MotionEvent
...
Bug:23905002
Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
2015-10-12 11:22:37 -07:00
Puneet Kumar
ec1323dbd4
am 2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
...
* commit '2f3c3eb4e47d7cb6ef67e0fd2063e4b93e38e9ec':
Allow defining replacement key events in keymap
2015-10-08 09:08:31 +00:00
Dmitry Torokhov
115f93eeeb
Allow defining replacement key events in keymap
...
Currently keyboard maps allow to assign character sequences to key
events and allow specifying a so-called "fallback" key events that are
re-injected into input stream if target application indicates that it
was not able to handle the original key event. Unfortunately there is no
way to perform substitution before handing the event to applicationis.
This change adds a new keymap keyword "replace" that allows users query
"replacement" actions for key (if any), with the intent that such
replacement happens early in the event handling process.
Bug: 24504154
Change-Id: I3e6a2476c856524171df00ad22ff56f2018c1278
2015-09-29 13:26:30 -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
3c8a147c83
Merge "Add KEYCODE_SOFT_SLEEP for Ungaze." into cw-e-dev
2015-09-04 18:04:11 +00: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
Dan Stoza
f2699fc3a8
SF: Add colorTransform to DisplayInfo
...
Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the DisplayInfo class, and
populates it from the HWC interface.
Bug: 20853317
Change-Id: I153edc36a361407656f3eb5082b96c2da2ecbec7
2015-08-31 13:41:24 -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
Aravind Akella
e2806cb445
Bug fix in SensorManager.
...
If SensorService hasn't started when SensorManager instance is requested, keep retrying for a
longer duration.
Bug: 22529981
Change-Id: I3c506d962b61347085fc80b2c5832289539d6853
2015-07-30 19:05:21 +00:00
Narayan Kamath
65f1d44cd8
am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev
...
* commit 'a29db50c448f8d00a544b925544f3dee725f7750':
Revert "Bug fix in SensorManager."
2015-07-29 10:07:56 +00:00
Narayan Kamath
a29db50c44
Merge "Revert "Bug fix in SensorManager."" into mnc-dev
2015-07-29 09:41:23 +00:00
Narayan Kamath
8034fc63a0
Revert "Bug fix in SensorManager."
...
This reverts commit 869eb2089e
2015-07-29 09:36:05 +00:00
Aravind Akella
3a77d00927
am 2376bd68: Merge "Bug fix in SensorManager." into mnc-dev
...
* commit '2376bd6869f4cd835a351322d48d35567eceec4f':
Bug fix in SensorManager.
2015-07-29 00:40:49 +00:00
Aravind Akella
2376bd6869
Merge "Bug fix in SensorManager." into mnc-dev
2015-07-29 00:21:09 +00:00
Aravind Akella
869eb2089e
Bug fix in SensorManager.
...
If SensorService hasn't started when SensorManager instance is requested, keep retrying for a
longer duration.
Bug: 22529981
Change-Id: I4ba6b760608e34d79273aeb39568f0fa72fbaf9d
2015-07-26 11:48:06 -07:00
Lajos Molnar
a6364e257d
am f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev
...
* commit 'f892f9141721a3805d18da2db0e1c17f1a99feb0':
omx: fix structure sizes to be the same on 32 and 64-bit builds
2015-07-21 00:37:21 +00:00
Lajos Molnar
abaaf70129
omx: fix structure sizes to be the same on 32 and 64-bit builds
...
Bug: 22512621
Change-Id: I2100b8aad0a1cf110936f4a765718ba97f3d8ce7
2015-07-21 00:19:04 +00:00
Adrian Roos
687aa22c92
Show charging speed on Keyguard
...
Bug: 8099739
Change-Id: I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36
2015-07-10 13:10:13 -07:00
Michael Wright
f37143d8a5
Merge "Cancel touches as well as pointer gestures." into mnc-dev
2015-07-09 21:56:21 +00:00
Aravind Akella
841a5926fc
Enable sensor data injection mode through adb.
...
Change-Id: I415cf8ff0871fa74babaf9b879c68f210298b472
2015-06-30 14:59:58 -07:00
Lajos Molnar
84112b0999
am 3875698f: am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
...
* commit '3875698f8d47af86e024817889e4107392d20439':
omx: add OMX_IndexParamConsumerUsageBits
2015-06-26 15:21:01 +00:00
Lajos Molnar
3875698f8d
am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
...
* commit 'e74f1557c7030a6c988d8e4cd940c933c4237ac8':
omx: add OMX_IndexParamConsumerUsageBits
2015-06-26 15:09:27 +00:00
Lajos Molnar
1017a1eaa7
omx: add OMX_IndexParamConsumerUsageBits
...
This is used by framework to query buffer consumers (e.g. video encoders)
about required usage bits.
Bug: 13222807
Change-Id: I508335c9d753c7a7224bb882f2228bd2f4144031
2015-06-25 16:58:52 -07: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
Dan Stoza
c8c0992ace
am 0638a4fa: Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-dev
...
* commit '0638a4fac7250e260c0102c770090cb7eefca936':
libgui/SF: Propagate SECURE Layer flag changes
2015-06-23 18:07:31 +00:00
Michael Wright
7d3ad69530
Merge commit '71997c1a' into manualmerge
...
Change-Id: Ia68fbd20ce66571dfd33764e52c3a00e2285e648
2015-06-23 19:04:31 +01:00
Dan Stoza
0638a4fac7
Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-dev
2015-06-23 15:44:10 +00:00
Michael Wright
cc62b6c65e
am 18c77330: Merge "Add method to set action button on MotionEvent" into mnc-dev
...
* commit '18c773307ad7ec017b1bdaed0be9323faad9986f':
Add method to set action button on MotionEvent
2015-06-23 13:10:42 +00:00
Michael Wright
71997c1a92
Merge "Add new AINPUT_SOURCE_BLUETOOTH_STYLUS" into mnc-dev
2015-06-23 12:49:30 +00:00
Dan Stoza
2311608667
libgui/SF: Propagate SECURE Layer flag changes
...
This allows changes to the SECURE flag to propagate down to
Layers in SurfaceFlinger so that WindowManager can change it on the fly
in response to device policy updates.
Bug: 20934462
Change-Id: I558f6d22c6273be373f1f480365e42536af18a33
2015-06-18 15:11:20 -07:00
Michael Wright
21957b9c6d
Add method to set action button on MotionEvent
...
Change-Id: I09f00fa1c2b793a88772f67fe195860ec436179d
2015-06-17 21:06:54 +01:00
Michael Wright
2f78b68cf1
Add new AINPUT_SOURCE_BLUETOOTH_STYLUS
...
Bug: 21531826
Change-Id: I3792860ad3f6579ceb50ccaa212f8fbd471a9b6b
2015-06-12 15:25:08 +01:00
Chris Craik
58996069ae
am 8a4222a6: Merge "Add tracing header" into mnc-dev
...
* commit '8a4222a647bd17c991959eca17a50ba911c3ab6b':
Add tracing header
2015-06-11 02:08:20 +00:00
Chris Craik
6a40d678ea
Add tracing header
...
bug:21195272
Change-Id: I520de9fee7fc40d0570d6bef450d756ce42a1462
2015-06-10 13:10:47 -07:00
Lajos Molnar
76ade36bd8
am 037d4ca3: Merge "media: change parameters for OMX_EventOutputRendered" into mnc-dev
...
* commit '037d4ca35abbcf40e244a5d09bade6dd8b9b2b0b':
media: change parameters for OMX_EventOutputRendered
2015-06-09 00:29:41 +00:00
Lajos Molnar
037d4ca35a
Merge "media: change parameters for OMX_EventOutputRendered" into mnc-dev
2015-06-09 00:04:30 +00:00
Dan Stoza
bcb868db92
am c6f30bde: libgui/SurfaceFlinger: Add getConsumerName
...
* commit 'c6f30bdee1f634eb90d68cb76efe935b6535a1e8':
libgui/SurfaceFlinger: Add getConsumerName
2015-06-08 17:18:52 +00:00
Dan Stoza
8fd259534f
am 5b36ea44: Merge "Revert "libgui: Add getConsumerName"" into mnc-dev
...
* commit '5b36ea44c58f8def561bf37c79d3452b21e2deab':
Revert "libgui: Add getConsumerName"
2015-06-08 17:04:11 +00:00
Dan Stoza
35751d35ab
am 5b23b5bf: Merge "libgui: Add getConsumerName" into mnc-dev
...
* commit '5b23b5bf45b115d2c91448747ea40b63377d4abd':
libgui: Add getConsumerName
2015-06-08 17:04:10 +00:00
Dan Stoza
c6f30bdee1
libgui/SurfaceFlinger: Add getConsumerName
...
Adds a getConsumerName method to IGraphicBufferProducer and Surface.
Currently, the name is cached inside of IGBP and is update on connect
and dequeueBuffer, which should be good enough for most uses.
Bug: 6667401
Change-Id: I22c7881d778e495cf8276de7bbcd769e52429915
2015-06-08 09:40:49 -07:00
Dan Stoza
5b36ea44c5
Merge "Revert "libgui: Add getConsumerName"" into mnc-dev
2015-06-08 16:30:15 +00:00
Dan Stoza
a2ca9bf0a9
Revert "libgui: Add getConsumerName"
...
This reverts commit 107fbe5599
2015-06-08 16:30:08 +00:00
Dan Stoza
5b23b5bf45
Merge "libgui: Add getConsumerName" into mnc-dev
2015-06-08 16:21:03 +00:00
