frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Call SkBitmap::config() instead of ::getConfig()"	Leon Scroggins III	2013-12-04	2	-7/+7
\|\
\| *	Call SkBitmap::config() instead of ::getConfig()	Leon Scroggins III	2013-12-03	2	-7/+7
* \|	Deprecate Android-specific SkPaint functions.	Victoria Lease	2013-12-03	2	-6/+9
\|/
*	Clean up quick rejection, especially surrounding points + lines.	Chris Craik	2013-11-22	8	-76/+139
*	Clean up modelView matrix logic	Chris Craik	2013-11-18	3	-96/+123
*	am 2f70da2b: am 6ed16a89: am 0b807d2e: Merge "Update the layer\'s alpha value...	Chris Craik	2013-11-06	1	-0/+6
\|\
\| *	am 6ed16a89: am 0b807d2e: Merge "Update the layer\'s alpha value upon composi...	Chris Craik	2013-11-06	1	-0/+6
\| \|\
\| \| *	Update the layer's alpha value upon composition of the layer	Digish Pandya	2013-11-05	1	-0/+6
* \| \|	Clean unused parameters, disable warnings	Chris Craik	2013-10-17	12	-40/+37
* \| \|	am b4d4d687: am 318ae7bb: Take SkBitmap\'s stride into account when uploading...	Romain Guy	2013-09-25	5	-18/+29
\|\ \ \ \| \|/ /
\| * \|	Take SkBitmap's stride into account when uploading textures	Romain Guy	2013-09-25	5	-18/+29
* \| \|	am bd842f96: am d8a84a86: Merge "Correct bitmap merging logic" into klp-dev	Chris Craik	2013-09-20	5	-13/+8
\|\ \ \ \| \|/ /
\| * \|	Merge "Correct bitmap merging logic" into klp-dev	Chris Craik	2013-09-21	5	-13/+8
\| \|\ \
\| \| * \|	Correct bitmap merging logic	Chris Craik	2013-09-20	5	-13/+8
* \| \| \|	am ab99b39d: am ddc0a63d: Merge "fix emoji clipping in hw draw path" into klp...	Victoria Lease	2013-09-20	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	fix emoji clipping in hw draw path	Victoria Lease	2013-09-19	1	-1/+1
\| \|/ /
* \| \|	resolved conflicts for merge of d97303a7 to master	Chris Craik	2013-09-17	4	-18/+43
\|\ \ \ \| \|/ /
\| * \|	Merge "Conservatively estimate geometry bounds" into klp-dev	Chris Craik	2013-09-18	4	-18/+43
\| \|\ \
\| \| * \|	Conservatively estimate geometry bounds	Chris Craik	2013-09-17	4	-18/+43
* \| \| \|	am 7cb404dd: am a42ceb03: Merge "Disallow negative scale matrices in merged B...	Chris Craik	2013-09-17	4	-3/+21
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Disallow negative scale matrices in merged Bitmap drawing" into klp-dev	Chris Craik	2013-09-18	4	-3/+21
\| \|\ \ \
\| \| * \| \|	Disallow negative scale matrices in merged Bitmap drawing	Chris Craik	2013-09-16	4	-3/+21
\| \| \|/ /
* \| \| \|	am bb451bda: am 0d3c52d3: Merge "Fix merged operation clipping" into klp-dev	Chris Craik	2013-09-13	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	Fix merged operation clipping	Chris Craik	2013-09-13	1	-1/+1
\| \|/ /
* \| \|	am 0885b291: am 4801a4f9: Merge "Always disable the clip for layers Bug #8149...	Romain Guy	2013-09-12	1	-4/+2
\|\ \ \ \| \|/ /
\| * \|	Always disable the clip for layers	Romain Guy	2013-09-12	1	-4/+2
* \| \|	am 3f30e67a: am 88ee0dac: Merge "Move DeferredDisplayState out of ops" into k...	Chris Craik	2013-09-12	6	-143/+195
\|\ \ \ \| \|/ /
\| * \|	Merge "Move DeferredDisplayState out of ops" into klp-dev	Chris Craik	2013-09-12	6	-143/+195
\| \|\ \
\| \| * \|	Move DeferredDisplayState out of ops	Chris Craik	2013-09-12	6	-143/+195
* \| \| \|	am 53760b4a: am 874ae2ad: Merge "Fix scissor for functor invocation" into klp...	John Reck	2013-09-10	1	-2/+4
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Fix scissor for functor invocation" into klp-dev	John Reck	2013-09-10	1	-2/+4
\| \|\ \ \
\| \| * \| \|	Fix scissor for functor invocation	John Reck	2013-09-10	1	-2/+4
* \| \| \| \|	am 19c727bb: am 895a4375: Merge "Fix FontRenderer bug." into klp-dev	Tim Murray	2013-09-10	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Fix FontRenderer bug.	Tim Murray	2013-09-10	1	-1/+1
\| \|/ / /
* \| \| \|	am 9163b1d9: am 23ae1461: Merge "Add flags word to initialization." into klp-dev	Tim Murray	2013-09-09	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	Add flags word to initialization.	Tim Murray	2013-09-09	1	-1/+1
\| \|/ /
* \| \|	am 9b824560: am 9b40bdf6: Merge "Dump the right matrix when logging display l...	Chris Craik	2013-09-06	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Dump the right matrix when logging display lists	Chris Craik	2013-09-05	1	-1/+1
* \| \|	am 7ff37ada: am ff2c22e2: Merge "Move functor GL setup to just before functor...	Chris Craik	2013-08-26	1	-6/+9
\|\ \ \ \| \|/ /
\| * \|	Move functor GL setup to just before functor	Chris Craik	2013-08-26	1	-6/+9
* \| \|	am c1acf799: am 243a026b: Merge "Second attempt at avoiding infinite loop in ...	Romain Guy	2013-08-21	1	-1/+16
\|\ \ \ \| \|/ /
\| * \|	Second attempt at avoiding infinite loop in PathCache::trim()	Romain Guy	2013-08-21	1	-1/+16
* \| \|	am b7db6d73: am e0a2435c: Merge "Properly account for created paths in the ca...	Romain Guy	2013-08-21	2	-1/+6
\|\ \ \ \| \|/ /
\| * \|	Properly account for created paths in the cache	Romain Guy	2013-08-21	2	-1/+6
* \| \|	am dfb79408: am 5b8efc47: Merge "Add overdraw debugging that accounts for Deu...	Romain Guy	2013-08-21	4	-9/+52
\|\ \ \ \| \|/ /
\| * \|	Add overdraw debugging that accounts for Deuteranomaly	Romain Guy	2013-08-21	4	-9/+52
* \| \|	am 816f3058: am cf8e6778: Merge "Handle updates to C++ API." into klp-dev	Tim Murray	2013-08-20	1	-2/+3
\|\ \ \ \| \|/ /
\| * \|	Handle updates to C++ API.	Tim Murray	2013-08-19	1	-2/+3
* \| \|	am 725617f6: am 83aec80f: Merge "Fix hardware layers lifecycle Bug #10075732"...	Romain Guy	2013-08-16	1	-0/+2
\|\ \ \ \| \|/ /
\| * \|	Fix hardware layers lifecycle	Romain Guy	2013-08-16	1	-0/+2