frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix Glop vertex alpha blending	Chris Craik	2015-02-09	3	-6/+17
*	Glop support for indexed quads	Chris Craik	2015-02-09	8	-53/+123
*	Merge "Glop ColorFilter & VertexBuffer support, initial enable"	Chris Craik	2015-02-06	39	-415/+443
\|\
\| *	Glop ColorFilter & VertexBuffer support, initial enable	Chris Craik	2015-02-06	39	-415/+443
* \|	Merge "Don't try to fully tear down program in terminate()"	Chris Craik	2015-02-05	1	-1/+1
\|\ \ \| \|/
\| *	Don't try to fully tear down program in terminate()	Chris Craik	2015-02-05	1	-1/+1
* \|	Merge "GlopBuilder, and test app refactor"	Chris Craik	2015-02-05	15	-112/+417
\|\ \ \| \|/
\| *	GlopBuilder, and test app refactor	Chris Craik	2015-02-04	15	-112/+417
* \|	resolved conflicts for merge of c7e6b93a to master	John Reck	2015-02-04	4	-13/+13
\|\ \
\| * \	am af6eaf65: Merge "Fix ANR caused by hwuiTask thread" automerge: 5ad36d4	John Reck	2015-02-04	4	-13/+13
\| \|\ \
\| \| * \	Merge "Fix ANR caused by hwuiTask thread"	John Reck	2015-02-04	4	-13/+13
\| \| \|\ \
\| \| \| * \|	Fix ANR caused by hwuiTask thread	Sangkyu Lee	2015-01-12	4	-13/+13
* \| \| \| \|	Merge "Refactoring of Program ownership/lifecycle, and WIP Glop rendering path"	Chris Craik	2015-02-03	17	-124/+293
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Refactoring of Program ownership/lifecycle, and WIP Glop rendering path	Chris Craik	2015-02-02	17	-124/+293
* \| \| \| \|	Merge "Add a WAIT_FOR_GPU_COMPLETION option"	John Reck	2015-01-30	4	-115/+21
\|\ \ \ \ \
\| * \| \| \| \|	Add a WAIT_FOR_GPU_COMPLETION option	John Reck	2015-01-30	4	-115/+21
* \| \| \| \| \|	Merge "Refactor blending and texture gl state"	Chris Craik	2015-01-30	26	-345/+498
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Refactor blending and texture gl state	Chris Craik	2015-01-30	26	-345/+498
* \| \| \| \| \|	Merge "Create proxy between Skia's SkCanvas and the framework Canvas."	Derek Sollenberger	2015-01-30	6	-12/+474
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Create proxy between Skia's SkCanvas and the framework Canvas.	Derek Sollenberger	2015-01-30	6	-12/+474
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge "Fix double create of Caches"	Chris Craik	2015-01-30	1	-1/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix double create of Caches	Chris Craik	2015-01-30	1	-1/+3
\| \|/ / / /
* \| \| \| \|	Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas"	Derek Sollenberger	2015-01-30	3	-54/+59
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Rename Canvas::getSkCanvas to Canvas::asSkCanvas	Derek Sollenberger	2015-01-29	3	-54/+59
* \| \| \| \|	resolved conflicts for merge of fe5ac4fc to master	John Reck	2015-01-29	5	-7/+27
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	am 5f3e21ce: am 6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDe...	John Reck	2015-01-29	5	-7/+26
\| \|\ \ \ \
\| \| * \| \| \|	Allow ~Layer() to happen after onGLContextDestroyed	John Reck	2015-01-29	5	-7/+26
* \| \| \| \| \|	Move more GL state management to RenderState and its directory	Chris Craik	2015-01-28	25	-497/+683
* \| \| \| \| \|	Move scissor state to RenderState	Chris Craik	2015-01-27	16	-198/+248
* \| \| \| \| \|	am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS."	Yabin Cui	2015-01-27	2	-10/+2
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| / / / \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS."	Yabin Cui	2015-01-27	2	-10/+2
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	kill HAVE_PTHREADS.	Yabin Cui	2015-01-26	2	-10/+2
* \| \| \| \|	Merge "Ensure compatible layout for vertices"	Rob Tsuk	2015-01-22	1	-16/+27
\|\ \ \ \ \
\| * \| \| \| \|	Ensure compatible layout for vertices	Rob Tsuk	2015-01-22	1	-16/+27
* \| \| \| \| \|	Remove DisplayListLogBuffer	Chris Craik	2015-01-21	10	-208/+14
* \| \| \| \| \|	Merge "Simplify and correct texture upload unpack alignment parameter"	Chris Craik	2015-01-20	1	-4/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Simplify and correct texture upload unpack alignment parameter	Chris Craik	2015-01-20	1	-4/+1
* \| \| \| \| \| \|	am d9bd0886: am aee7225e: Merge "Process base APK" into lmp-mr1-dev automerge...	Adam Lesinski	2015-01-20	1	-1/+7
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am aee7225e: Merge "Process base APK" into lmp-mr1-dev	Adam Lesinski	2015-01-20	1	-1/+7
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Process base APK	Adam Lesinski	2015-01-16	1	-1/+7
* \| \| \| \| \| \|	Move Canvas	John Reck	2015-01-20	5	-3/+876
\| \|_\|_\|/ / / \|/\| \| \| \| \|
* \| \| \| \| \|	am a2e1630b: am 996d3974: am ed35f5c7: Merge "Fast loadInverse() implementati...	Chris Craik	2015-01-16	1	-4/+32
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 996d3974: am ed35f5c7: Merge "Fast loadInverse() implementation for the co...	Chris Craik	2015-01-16	1	-4/+32
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	Fast loadInverse() implementation for the common case	Romain Guy	2015-01-15	1	-4/+32
\| * \| \| \| \|	Restore write_delete_file	Brian Carlstrom	2015-01-14	1	-0/+7
* \| \| \| \| \|	Merge "Clipping performance improvements"	Rob Tsuk	2015-01-15	15	-204/+884
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Clipping performance improvements	Rob Tsuk	2015-01-14	15	-204/+884
* \| \| \| \| \| \|	am cefeb34e: am 2c9f86aa: am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-dev	John Reck	2015-01-15	1	-0/+8
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am 2c9f86aa: am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-dev	John Reck	2015-01-15	1	-0/+8
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge "Vsyncs are hard" into lmp-mr1-dev	John Reck	2015-01-15	1	-0/+8
\| \| \|\ \ \ \ \