summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* Frameworks/base: Wall Werror in libs/androidfwAndreas Gampe2014-11-0710-248/+410
* resolved conflicts for merge of 3028394c to stage-aosp-masterNarayan Kamath2014-10-292-1/+9
|\
| * Suppress Clang compilation warnings.Chih-Hung Hsieh2014-10-246-7/+17
* | Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-masterBill Yi2014-10-22204-6025/+26993
|\ \ | |/ |/|
| * am aeef612f: Merge "Search all packages for a given type string when looking ...Adam Lesinski2014-10-092-43/+60
| |\
| | * Search all packages for a given type string when looking up resources by nameAdam Lesinski2014-10-092-43/+60
| * | am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-devJohn Reck2014-10-036-41/+36
| |\ \ | | |/
| | * Cleanup DeferredLayerUpdaterJohn Reck2014-10-036-41/+36
| * | am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into ...ztenghui2014-10-011-1/+1
| |\ \ | | |/
| | * + correcting shadow visual appearance (b/17610926)ztenghui2014-10-011-1/+1
| * | am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a s...Adam Powell2014-10-011-5/+1
| |\ \
| | * | Revert "Fix issue with using locally defined attrs in a shared lib"Adam Powell2014-10-011-5/+1
| * | | am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared li...Adam Lesinski2014-10-011-1/+5
| |\ \ \ | | |/ /
| | * | Fix issue with using locally defined attrs in a shared libAdam Lesinski2014-09-301-1/+5
| | |/
| * | am fd0a1df1: am 737dfe57: Merge "Reject transparent draws more conservatively...Chris Craik2014-09-231-1/+1
| |\ \ | | |/
| | * Reject transparent draws more conservativelyChris Craik2014-09-231-1/+1
| * | am 91a40be0: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-devChris Craik2014-09-191-1/+3
| |\ \ | | |/
| | * 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
| * | | resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-192-3/+6
| |\ \ \
| * \ \ \ resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aospDan Albert2014-09-191-1/+0
| |\ \ \ \
| * \ \ \ \ am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...Adam Lesinski2014-09-192-1/+41
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | 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
| * | | | | | am 923ccf24: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-devJohn Reck2014-09-191-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "glFinish to flush deletes" into lmp-devJohn Reck2014-09-191-0/+1
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | glFinish to flush deletesJohn Reck2014-09-191-0/+1
| * | | | | | am 658a7846: am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into...Chris Craik2014-09-194-2/+15
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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
| * | | | | | am a19867e1: am fd340229: Merge "Special case EGL_BAD_SURFACE" into lmp-devJohn Reck2014-09-173-6/+20
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Special case EGL_BAD_SURFACE" into lmp-devJohn Reck2014-09-173-6/+20
| | |\ \ \ \ \
| | | * | | | | Special case EGL_BAD_SURFACEJohn Reck2014-09-173-6/+20
| | | |/ / / /
| * | | | | | am d0738f9c: am 8523ad90: Merge "Change default fbo cache size to 0" into lmp...John Reck2014-09-171-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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
| | | |/ / / /
| * | | | | | am befbdaba: am b5a27aee: Merge "Handle premultiplication correctly for Color...Chris Craik2014-09-172-1/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Handle premultiplication correctly for ColorMatrixColorFiltersChris Craik2014-09-172-1/+5
| | |/ / / /
| * | | | | am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ripples"...Jorim Jaggi2014-09-163-0/+49
| |\ \ \ \ \ | | |/ / / /
| | * | | | Use RenderThread for navigation bar ripplesJorim Jaggi2014-09-163-0/+49
| | |/ / /
| * | | | am 4dae506c: am e27790db: Merge "Force isolation of clip and matrix within la...Chris Craik2014-09-152-0/+6
| |\ \ \ \ | | |/ / /
| | * | | 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
| * | | | | am b5f00ba9: am cceffe72: Merge "Correctly initialize animator asynchronousit...Chris Craik2014-09-131-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Correctly initialize animator asynchronousity" into lmp-devChris Craik2014-09-131-1/+2
| | |\ \ \ \
| | | * | | | Correctly initialize animator asynchronousityChris Craik2014-09-121-1/+2
| | | |/ / /
| * | | | | am 35e78a38: am 84a7c1cc: Merge "Update the shadow strength" into lmp-devztenghui2014-09-131-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Update the shadow strength" into lmp-devztenghui2014-09-121-1/+1
| | |\ \ \ \
| | | * | | | Update the shadow strengthztenghui2014-09-121-1/+1
| | | |/ / /
| * | | | | am c168393b: am 3fd1ada4: Merge "Disable layer leak tracking" into lmp-devChris Craik2014-09-122-0/+6
| |\ \ \ \ \ | | |/ / / /