summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-devJohn Reck2014-10-036-41/+36
|\ | | | | | | | | * commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb': Cleanup DeferredLayerUpdater
| * Cleanup DeferredLayerUpdaterJohn Reck2014-10-036-41/+36
| | | | | | | | | | | | | | | | | | | | Bug: 17765082 DeferredLayerUpdater had fallen behind RT updates. Re-snap to latest expectations, ensuring to call requireGlContext() prior to detachSurfaceTexture to avoid leaking SurfaceTextures Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
* | am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into ↵ztenghui2014-10-011-1/+1
|\ \ | |/ | | | | | | | | | | lmp-dev * commit 'f903304896809039430c5e52bd0c24052f51b14f': + correcting shadow visual appearance (b/17610926)
| * + correcting shadow visual appearance (b/17610926)ztenghui2014-10-011-1/+1
| | | | | | | | | | | | | | | | + adjusting spot and ambient shadow opacity constants to achieve desired appearance + reducing ambient scale ratio back to 1.0 to address over-lightening at higher elevations + partially revert ag/546290 Change-Id: I9d7f664f73a7b9b83df73b739103c97054bd4f6e
* | am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a ↵Adam Powell2014-10-011-5/+1
|\ \ | | | | | | | | | | | | | | | | | | shared lib"" into lmp-dev * commit 'c6a06d437cf2ee7926a01b2f8ee685555bfb3d81': Revert "Fix issue with using locally defined attrs in a shared lib"
| * | Revert "Fix issue with using locally defined attrs in a shared lib"Adam Powell2014-10-011-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6. The reverted commit caused issues loading resources supplied by static libraries. Bug 17748356 Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
* | | am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared ↵Adam Lesinski2014-10-011-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | lib" into lmp-dev * commit 'cd8e73817d14798f9d2031ffd301a03a096b7907': Fix issue with using locally defined attrs in a shared lib
| * | Fix issue with using locally defined attrs in a shared libAdam Lesinski2014-09-301-1/+5
| |/ | | | | | | | | | | | | | | | | | | | | The attribute name resource IDs were never fixed up with the runtime package ID so we weren't finding attributes whenever the runtime package ID was different than the build time one, which happened to be when a shared lib referenced itself (0x00 vs 0x02). Bug:17666947 Change-Id: Icf3e874bcea0e27eebe42d60fbed626a34bf9266
* | am fd0a1df1: am 737dfe57: Merge "Reject transparent draws more ↵Chris Craik2014-09-231-1/+1
|\ \ | |/ | | | | | | | | | | conservatively" into lmp-dev * commit 'fd0a1df16fba712fb569eb637d960a7e78e3e62c': Reject transparent draws more conservatively
| * Reject transparent draws more conservativelyChris Craik2014-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | bug:17600162 Transparent draws are not safe to reject for all xfermodes other than clear. Now, to be safe, only perform the rejection for SrcOver draws since other modes are fairly uncommon. We could specifically determine whether the xfermode could change the output given a transparent input, but there's little to be gained from the additional complexity. Change-Id: Ia699ac4bdc4da3353955840b53f1922d3cb1d85d
* | am 91a40be0: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-devChris Craik2014-09-191-1/+3
|\ \ | |/ | | | | | | * commit '91a40be04f8d1822c27888cc47124bf965633f4f': Account for alpha in hasShadow()
| * Merge "Account for alpha in hasShadow()" into lmp-devChris Craik2014-09-191-1/+3
| |\
| | * Account for alpha in hasShadow()Chris Craik2014-09-191-1/+3
| | | | | | | | | | | | | | | bug:17587220 Change-Id: Ic7f2dea95302b713dc93edb4a0193a7be77fb2eb
* | | resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-192-3/+6
|\ \ \ | | | | | | | | | | | | Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
| * | | Clean up makefile cruft.Dan Albert2014-09-112-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | The build system already takes care of all these things. Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
* | | | resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aospDan Albert2014-09-191-1/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I9d0f81003f84d03a7a67420dd496fde18dd654d4
| * | | Merge "Clean up test makefiles."Dan Albert2014-09-111-5/+0
| |\ \ \
| | * | | Clean up test makefiles.Dan Albert2014-09-111-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build system takes care of linking the correct STL and gtest libraries for you, and specifying them manually confuses the build system when using libc++. Change-Id: I9f76ab26a63ace51293614cfb5ca002f37438e02
* | | | | am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT ↵Adam Lesinski2014-09-192-1/+41
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | public attrs" into lmp-dev * commit '8bdb265f0a73bc6f2114ca70f141c214a23696c7': Fix backwards compat problem with AAPT public attrs
| * | | | Merge "Fix backwards compat problem with AAPT public attrs" into lmp-devAdam Lesinski2014-09-192-1/+41
| |\ \ \ \
| | * | | | Fix backwards compat problem with AAPT public attrsAdam Lesinski2014-09-182-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAPT has traditionally assigned resource IDs to public attributes, and then followed those public definitions with private attributes. --- PUBLIC --- | 0x01010234 | attr/color | 0x01010235 | attr/background --- PRIVATE --- | 0x01010236 | attr/secret | 0x01010237 | attr/shhh Each release, when attributes are added, they take the place of the private attributes and the private attributes are shifted down again. --- PUBLIC --- | 0x01010234 | attr/color | 0x01010235 | attr/background | 0x01010236 | attr/shinyNewAttr | 0x01010237 | attr/highlyValuedFeature --- PRIVATE --- | 0x01010238 | attr/secret | 0x01010239 | attr/shhh Platform code may look for private attributes set in a theme. If an app compiled against a newer version of the platform uses a new public attribute that happens to have the same ID as the private attribute the older platform is expecting, then the behavior is undefined. We get around this by detecting any newly defined attributes (in L), copy the resource into a -v21 qualified resource, and delete the attribute from the original resource. This ensures that older platforms don't see the new attribute, but when running on L+ platforms, the attribute will be respected. We still need to address this problem in the platform moving forward, as this will only help us in the transition from pre L to L. Bug:17520380 Change-Id: Ia2a985798b50006c21c7c3431d30d9598f27cd91
* | | | | | am 923ccf24: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-devJohn Reck2014-09-191-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '923ccf247415587a23e7be40eacf4cdb7b4f1503': glFinish to flush deletes
| * | | | | Merge "glFinish to flush deletes" into lmp-devJohn Reck2014-09-191-0/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | glFinish to flush deletesJohn Reck2014-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17479800 Change-Id: I4d4a3eeda510e037f806052025184f3cde18c847
* | | | | | am 658a7846: am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" ↵Chris Craik2014-09-194-2/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '658a7846cac4235653fe264c09182302262971ae': Fix garbage showing up beneath dialogs
| * | | | | Merge "Fix garbage showing up beneath dialogs" into lmp-devChris Craik2014-09-194-2/+15
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix garbage showing up beneath dialogsChris Craik2014-09-184-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:17463894 Fixes the setViewport method to immediately affect the return values of getViewportWidth/Height methods. Also works around tiling extension issues observed on first frame after window resize by disabling tiling for that frame. Change-Id: Ie172d572d20d74a1be9cc58ad389af2cffa0e4b6
* | | | | | am a19867e1: am fd340229: Merge "Special case EGL_BAD_SURFACE" into lmp-devJohn Reck2014-09-173-6/+20
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'a19867e1b279239579a88002c86b63cdb2ad8a58': Special case EGL_BAD_SURFACE
| * | | | | Merge "Special case EGL_BAD_SURFACE" into lmp-devJohn Reck2014-09-173-6/+20
| |\ \ \ \ \
| | * | | | | Special case EGL_BAD_SURFACEJohn Reck2014-09-173-6/+20
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17516789 Change-Id: I3dcb10360c2aef6326f7dbbff6815866d4c143b6
* | | | | | am d0738f9c: am 8523ad90: Merge "Change default fbo cache size to 0" into ↵John Reck2014-09-171-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'd0738f9c1e049ebd881ea9c5fb93076e0aeb81cc': Change default fbo cache size to 0
| * | | | | Merge "Change default fbo cache size to 0" into lmp-devJohn Reck2014-09-171-1/+1
| |\ \ \ \ \
| | * | | | | Change default fbo cache size to 0John Reck2014-09-171-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17479800 FBO cache is very expensive and no longer necessary, disable it by just setting size to 0. Change-Id: I664616f262c8339919e1d20baaafa5de2b628d7e
* | | | | | am befbdaba: am b5a27aee: Merge "Handle premultiplication correctly for ↵Chris Craik2014-09-172-1/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ColorMatrixColorFilters" into lmp-dev * commit 'befbdaba72a2c1502ff6135a8214f7434a6b2ea7': Handle premultiplication correctly for ColorMatrixColorFilters
| * | | | | Handle premultiplication correctly for ColorMatrixColorFiltersChris Craik2014-09-172-1/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:17405627 Previously, the input content to the color matrix computation was left premultiplied. Since the color matrix could reduce the alpha channel, the alpha was re-multiplied, but this was incomplete, and incorrect. Instead, apply the color matrix in unpremultiplied space. Change-Id: I87b8e03d2e228e6ded81f7bbfea952605d7a095c
* | | | | am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ↵Jorim Jaggi2014-09-163-0/+49
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | ripples" into lmp-dev * commit 'd2420d39c03c17ec62b283e5a99c33ff1360926f': Use RenderThread for navigation bar ripples
| * | | | Use RenderThread for navigation bar ripplesJorim Jaggi2014-09-163-0/+49
| |/ / / | | | | | | | | | | | | | | | | Bug: 17506181 Change-Id: Icf3b80f8c4bc29fe85313381d4019dda3ef85ea9
* | | | am 4dae506c: am e27790db: Merge "Force isolation of clip and matrix within ↵Chris Craik2014-09-152-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | layer" into lmp-dev * commit '4dae506c27327a3ddced29fc15880c86abe3a3a5': Force isolation of clip and matrix within layer
| * | | Merge "Force isolation of clip and matrix within layer" into lmp-devChris Craik2014-09-152-0/+6
| |\ \ \
| | * | | Force isolation of clip and matrix within layerChris Craik2014-09-142-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:17379260 Unclipped save layers need to isolate their clips and matrices so that the save time readout of background content matches clip and position with the restore/compose step. Change-Id: I2de474cda76e960d080852f1716d6ddfa8a512d4
* | | | | am b5f00ba9: am cceffe72: Merge "Correctly initialize animator ↵Chris Craik2014-09-131-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | asynchronousity" into lmp-dev * commit 'b5f00ba90ff201153de8386a3ebcd4eb5c06cb9e': Correctly initialize animator asynchronousity
| * | | | Merge "Correctly initialize animator asynchronousity" into lmp-devChris Craik2014-09-131-1/+2
| |\ \ \ \
| | * | | | Correctly initialize animator asynchronousityChris Craik2014-09-121-1/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | bug:17483792 Change-Id: Icb6b6e6318d4c79ee94228806cb60b275424b9c9
* | | | | am 35e78a38: am 84a7c1cc: Merge "Update the shadow strength" into lmp-devztenghui2014-09-131-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '35e78a38dc3a1080ef215b385dc96e67f6388791': Update the shadow strength
| * | | | Merge "Update the shadow strength" into lmp-devztenghui2014-09-121-1/+1
| |\ \ \ \
| | * | | | Update the shadow strengthztenghui2014-09-121-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | b/17486691 Change-Id: I8e8f0b64e757772c18f038f6b329ef91a4e155a5
* | | | | am c168393b: am 3fd1ada4: Merge "Disable layer leak tracking" into lmp-devChris Craik2014-09-122-0/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c168393b3ba99721be2c2d9629d687431aa6b9e0': Disable layer leak tracking
| * | | | Merge "Disable layer leak tracking" into lmp-devChris Craik2014-09-122-0/+6
| |\ \ \ \
| | * | | | Disable layer leak trackingChris Craik2014-09-122-0/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | bug:17208461 Change-Id: Ibbdf3ec79c4fd19e1935a559d425d074b611e162
* | | | | am c83a9ad6: am 3e39b8ad: Merge "Snap outline clipping to integer ↵Chris Craik2014-09-121-2/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | coordinates correctly" into lmp-dev * commit 'c83a9ad69474fdc75cdf5f84c47bd89b61640377': Snap outline clipping to integer coordinates correctly