Commit Graph

2070 Commits

Author SHA1 Message Date
Byunghun Jeon
987034b563 SurfaceFlinger: Native changes to add blur effect
Native changes to add blur-behind and blur mask effect

Change-Id: I54faf82d750e8299de6d261f6a893ab26d08df84

SurfaceFlinger: Adding template for LayerBlur files

Change-Id: I444009113b7bdd6c5284863fd1f56358e67d9fe6

SurfaceFlinger: Featurize libuiblur module for OSS build

Change-Id: Ifdc176e699434125d17b111c044b8ba954cf717c
2015-11-08 01:07:13 -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
Roman Birg
4dcf7868e3 update app ops
Change-Id: Id189866c1868e6340b1b01ca94c06983fbcc242d
Signed-off-by: Roman Birg <roman@cyngn.com>
2015-11-02 11:51:17 -08:00
codeworkx
af2d946f2d binder: Squashed commit of MemoryHeapBaseIon
Source:
http://git.insignal.co.kr/samsung/exynos/android/platform/frameworks/native/commit/?h=exynos-jb&id=dc4cd25cc41e4358debd0c7d1a2706d208a58df6

Change-Id: Ib06cc37a2a25c78a061ee2bad48eec2d01b07833

binder: update MemoryHeapIon

* Update from ODROID-XU 09232013 BSP release

Change-Id: I5245c8a9f783e8902bf91a0ee23e60ebeb335b27

binder: update MemoryHeapIon

* Update from ODROID-XU 04212014 BSP

Change-Id: Ifc2664bcde37a71d855e05e7c9e50288a4508892

binder: Fixed new CM SLSI build variant

Change-Id: Icfff592cf705af660c7318b08fce75dbbf42103c
(cherry picked from commit 014ad5eee0a7de70c4a9f66e8f5ce7b32f4ecb16)
2015-11-02 17:29:40 +01:00
Jorge Ruesga
bfcd443950 native: dock battery
Change-Id: I23eadf0361cbe25029b95dbd022ce1a2cc96e94d
Require: topic:dock_battery
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
2015-10-17 14:04:39 -07: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
Ethan Chen
bd33987d72 Add GESTURE_SENSOR input source
Change-Id: If61a7e7bf2d8b2665db7ca57ed68a4462d0c1783
2015-10-17 13:53:53 -07:00
Pawit Pornkitprasan
fd1fb639a1 Bring back support for glReadPixels screenshot path
Squashed commit of the following:

commit 012d3fe41d1d6cd38a0858b59145e9a4447641fa
Author: Hashcode <hashcode0f@gmail.com>
Date:   Sun Dec 8 19:36:50 2013 +0000

    sf: Always use opengles for screen capture

    Go back to the usage of GRALLOC_USAGE_HW_TEXTURE and GRALLOC_USAGE_HW_RENDERER
    in captureScreenImplLocked regardless of useReadPixels value

    This fixes the EGL_NO_IMAGE_KHR error returned from
    eglCreateImageKHR (blank images returned from screenshot path)

    Change-Id: I62fe90a081607b9e89c67f3dcfd34c84efc89d35

commit 4866ddf98ac98d8e22a1cd6a21894bb17f274588
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Thu Oct 31 03:53:39 2013 +0000

    Revert "remove support for glReadPixels screenshot path"

    This reverts commit 3ca76f416b.

    Conflicts:
    	include/gui/ISurfaceComposer.h
    	libs/gui/ISurfaceComposer.cpp
    	libs/gui/SurfaceComposerClient.cpp
    	services/surfaceflinger/SurfaceFlinger.cpp
    	services/surfaceflinger/SurfaceFlinger.h

    Change-Id: I8c239e533757af770e418dbb198f5a86c736961f

Change-Id: I8c239e533757af770e418dbb198f5a86c736961f
2015-10-16 14:45:10 -07:00
Ricardo Cerqueira
e3fc10fbb7 exynos4: getphys implementation on buffermanager for samsung omx
Change-Id: I73d9633e1a7b3316ede28dd1369f8f069609cbb0
2015-10-15 11:35:09 -07:00
Vinu Deokaran
bd170ee5b6 gui: add Tertiary display support in surface composer header
Add definition of Tertiary display into the enumeration list of
surface composer header file, to support third display for all
Surface Flinger APIs.

Change-Id: Ic932be4f7f1ac9c44a5a8f36d17eb9386135de87
2015-10-06 03:22:25 -06: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
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.

Change-Id: I4fb865e3b18bbb011fa4e4b4732336930c3a45ae
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.

Change-Id: I0c2b0f7c81193b05eb3dd2f5a59f83598434b744
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
Jeff Brown
6f33fbc82b am 13b16040: Enable more flexible usage of blobs in parcels.
* commit '13b1604018968408bcc5553e1fa5ea9df3e4e009':
  Enable more flexible usage of blobs in parcels.
2015-06-06 04:47:56 +00:00