frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of e2aa0490 to master	Dianne Hackborn	2011-06-09	1	-5/+5
\|\
\| *	am a1396dfe: am 02140891: Merge "Work on issue #4518815: Compatibility mode i...	Dianne Hackborn	2011-06-08	1	-5/+5
\| \|\
\| \| *	Merge "Work on issue #4518815: Compatibility mode introduces compatibility re...	Dianne Hackborn	2011-06-08	1	-5/+5
\| \| \|\
\| \| \| *	Work on issue #4518815: Compatibility mode introduces compatibility regressio...	Dianne Hackborn	2011-06-08	1	-5/+5
* \| \| \|	am 96fcb702: am b40e85f9: am 645434fb: Merge "Fix a leak in RefBase" into hon...	Mathias Agopian	2011-06-09	1	-6/+10
\|\ \ \ \ \| \|/ / /
\| * \| \|	am b40e85f9: am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2	Mathias Agopian	2011-06-08	1	-6/+10
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Fix a leak in RefBase	Mathias Agopian	2011-06-08	1	-6/+10
\| \| \|/
* \| \|	Merge "More work to make libRS buildable on the host."	Alex Sakhartchouk	2011-06-09	20	-134/+151
\|\ \ \
\| * \| \|	More work to make libRS buildable on the host.	Alex Sakhartchouk	2011-06-03	20	-134/+151
* \| \| \|	Merge "Fix handling of directory entries"	Christopher Tate	2011-06-08	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Fix handling of directory entries	Christopher Tate	2011-06-08	1	-0/+1
* \| \| \| \|	am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4...	Jeff Brown	2011-06-07	1	-9/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| / / \| \| \|/ / \| \|/\| \|
\| * \| \|	am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into ...	Jeff Brown	2011-06-06	1	-9/+0
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	Jeff Brown	2011-06-06	1	-9/+0
\| \| \|\ \
\| \| \| * \|	Revert velocity damping.	Jeff Brown	2011-06-06	1	-9/+0
\| \| * \| \|	merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)	Mathias Agopian	2011-06-06	1	-3/+9
\| \| \|/ /
\| * \| \|	resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp	Marco Nelissen	2011-06-06	1	-3/+9
\| \|\ \ \
\| \| * \ \	am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into ginge...	Simon Wilson	2011-05-24	1	-3/+9
\| \| \|\ \ \
\| \| \| * \| \|	RefBase subclasses can now decide how they want to be destroyed.	Mathias Agopian	2011-05-23	1	-3/+9
* \| \| \| \| \|	Fix embedded spaces in tar stream EVEN HARDER	Christopher Tate	2011-06-07	1	-2/+2
* \| \| \| \| \|	Implement shared-storage full backup/restore	Christopher Tate	2011-06-07	1	-2/+2
* \| \| \| \| \|	CameraParameters: add PIXEL_FORMAT_RGBA8888	Iliyan Malchev	2011-06-06	1	-0/+1
* \| \| \| \| \|	Merge "Measure text with the appropriate text encoding. Bug #4546327"	Romain Guy	2011-06-03	1	-6/+11
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Measure text with the appropriate text encoding.	Romain Guy	2011-06-03	1	-6/+11
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	am 56503b8d: am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration....	Jeff Brown	2011-06-03	1	-0/+89
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| / / / / \| \|/ / / /
\| * \| \| \|	am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeyc...	Jeff Brown	2011-06-02	1	-0/+89
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Implement pointer acceleration.	Jeff Brown	2011-06-02	1	-0/+89
\| * \| \| \|	am 6c2db6fb: am 95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the...	James Dong	2011-05-27	1	-2/+2
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."	James Dong	2011-05-27	1	-2/+2
\| * \| \| \|	am a33bb164: am 4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR x...	Romain Guy	2011-05-26	1	-2/+2
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2	Romain Guy	2011-05-26	1	-2/+2
\| \| \|\ \ \
\| \| \| * \| \|	DO NOT MERGE Correctly implement the CLEAR xfermode.	Romain Guy	2011-05-26	1	-2/+2
\| * \| \| \| \|	am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad g...	Jeff Brown	2011-05-25	2	-1/+11
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)	Jeff Brown	2011-05-25	2	-1/+11
\| * \| \| \| \|	am d5358874: am 5ced76a1: Coalesce input events that arrive faster than 333Hz...	Jeff Brown	2011-05-25	1	-1/+7
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)	Jeff Brown	2011-05-25	1	-1/+7
\| * \| \| \| \|	am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NO...	Jeff Brown	2011-05-25	2	-12/+25
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Refactor how timeouts are calculated. (DO NOT MERGE)	Jeff Brown	2011-05-23	2	-12/+25
\| * \| \| \| \|	am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability....	Jeff Brown	2011-05-25	1	-32/+115
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Improve VelocityTracker numerical stability. (DO NOT MERGE)	Jeff Brown	2011-05-23	1	-32/+115
\| * \| \| \| \|	am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the poi...	Jeff Brown	2011-05-25	2	-2/+156
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)	Jeff Brown	2011-05-23	2	-2/+156
* \| \| \| \| \|	Merge "Restore from a previous full backup's tarfile"	Christopher Tate	2011-06-01	1	-0/+10
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Restore from a previous full backup's tarfile	Christopher Tate	2011-06-01	1	-0/+10
* \| \| \| \| \| \|	Merge "Add support to OpenGLRendere to draw BiDi text. Bug #4350336"	Romain Guy	2011-06-01	7	-49/+84
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Add support to OpenGLRendere to draw BiDi text.	Romain Guy	2011-06-01	7	-49/+84
* \| \| \| \| \| \|	9-axis sensor fusion with Kalman filter	Mathias Agopian	2011-05-27	1	-0/+8
* \| \| \| \| \| \|	Merge "Fix issue with drawColor(color, Mode.Clear)"	Romain Guy	2011-05-27	2	-0/+15
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Fix issue with drawColor(color, Mode.Clear)	Romain Guy	2011-05-27	2	-0/+15
* \| \| \| \| \| \|	Merge "Cleaup of rsComponent to remove GL types."	Jason Sams	2011-05-27	5	-58/+51
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|