frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Fix bug 4345702 - update action bar tab views when the Tab object is u...	Adam Powell	2011-05-03	3	-23/+64
\|\
\| *	Fix bug 4345702 - update action bar tab views when the Tab object is	Adam Powell	2011-05-03	3	-23/+64
* \|	Merge "Try fixing auto data inlining again."	Jason Sams	2011-05-03	1	-5/+9
\|\ \
\| * \|	Try fixing auto data inlining again.	Jason Sams	2011-05-02	1	-5/+9
* \| \|	Merge "Clean up use of rsSetObject/rsClearObject."	Stephen Hines	2011-05-03	4	-15/+11
\|\ \ \
\| * \| \|	Clean up use of rsSetObject/rsClearObject.	Stephen Hines	2011-05-02	4	-15/+11
* \| \| \|	am e21f3764: (-s ours) am 75c66458: am 8325c3a8: Backporting I57c58c4083bd59f...	Dan Morrill	2011-05-03	0	-0/+0
\|\ \ \ \
\| * \ \ \	am 75c66458: am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff...	Dan Morrill	2011-05-03	1	-0/+13
\| \|\ \ \ \
\| \| * \ \ \	am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1....	Dan Morrill	2011-05-03	1	-0/+13
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change	Dan Morrill	2011-05-02	1	-0/+13
* \| \| \| \| \| \|	Merge "Add an auto-exposure lock feature to the Camera API."	Eino-Ville Talvala	2011-05-03	3	-0/+100
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add an auto-exposure lock feature to the Camera API.	Eino-Ville Talvala	2011-05-02	3	-0/+100
* \| \| \| \| \| \| \|	Merge "Import revised translations."	Eric Fischer	2011-05-03	7	-9/+9
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Import revised translations.	Eric Fischer	2011-05-02	7	-9/+9
* \| \| \| \| \| \| \| \|	am 3165f1a8: am d0d44c4e: Merge "Make DataConnection asynchronous." into hone...	Wink Saville	2011-05-02	9	-410/+778
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| / \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE	Wink Saville	2011-05-02	9	-410/+778
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Merge "Make DataConnection asynchronous." into honeycomb-LTE	Wink Saville	2011-05-02	9	-410/+778
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	Make DataConnection asynchronous.	Wink Saville	2011-05-02	9	-410/+778
* \| \| \| \| \| \| \| \|	Remove debug logging	Adam Powell	2011-05-02	1	-8/+0
* \| \| \| \| \| \| \| \|	Merge "Refactoring of action bar internals"	Adam Powell	2011-05-02	13	-253/+461
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Refactoring of action bar internals	Adam Powell	2011-05-02	13	-253/+461
* \| \| \| \| \| \| \| \| \|	Merge "Allows to render with an OpenGL context inside a TextureView."	Romain Guy	2011-05-02	22	-56/+512
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Allows to render with an OpenGL context inside a TextureView.	Romain Guy	2011-05-02	22	-56/+512
* \| \| \| \| \| \| \| \| \| \|	Merge "remove last traces of copybit"	Mathias Agopian	2011-05-02	3	-18/+0
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	remove last traces of copybit	Mathias Agopian	2011-05-02	3	-18/+0
* \| \| \| \| \| \| \| \| \| \| \|	Merge "MediaScanner: Add special casing of WMP album art files to isNoMediaPa...	Mike Lockwood	2011-05-02	1	-29/+37
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	MediaScanner: Add special casing of WMP album art files to isNoMediaPath()	Mike Lockwood	2011-05-02	1	-29/+37
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "resolved conflicts for merge of db46fa25 to master"	Robert Greenwalt	2011-05-02	10	-75/+324
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	resolved conflicts for merge of db46fa25 to master	Robert Greenwalt	2011-05-02	10	-75/+324
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycom...	Robert Greenwalt	2011-05-02	10	-75/+324
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE	Robert Greenwalt	2011-05-02	10	-75/+324
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \| \| \| \|	Add RouteInfo objects for tracking routes.	Robert Greenwalt	2011-05-02	10	-75/+324
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Line endcaps for AA lines are now antialiased."	Chet Haase	2011-05-02	7	-65/+225
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Line endcaps for AA lines are now antialiased.	Chet Haase	2011-05-02	7	-65/+225
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Remove unnecessary code."	Romain Guy	2011-05-02	1	-144/+38
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary code.	Romain Guy	2011-05-02	1	-144/+38
\| \| \|_\|_\|_\|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Moving renderscript GL code into the HAL This change affects - shader...	Alex Sakhartchouk	2011-05-02	35	-986/+1549
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moving renderscript GL code into the HAL	Alex Sakhartchouk	2011-04-29	35	-986/+1549
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Temporarly disable auto-inbanding."	Jason Sams	2011-05-02	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Temporarly disable auto-inbanding.	Jason Sams	2011-05-02	1	-1/+2
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "MediaScanner: Fix bug in "no media" handling logic"	Mike Lockwood	2011-05-02	1	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MediaScanner: Fix bug in "no media" handling logic	Mike Lockwood	2011-05-02	1	-3/+4
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhc...	Irfan Sheriff	2011-05-02	4	-131/+545
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| / / / / \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into hon...	Irfan Sheriff	2011-05-02	4	-131/+545
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE	Irfan Sheriff	2011-05-02	4	-131/+545
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Add DhcpStateMachine for interation with dhcpcd	Irfan Sheriff	2011-04-30	4	-131/+545
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve merge conflicts for merge of 21083066 to master.	Wink Saville	2011-05-02	2	-48/+140
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTE	Wink Saville	2011-05-02	2	-59/+164
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Enhance AsyncChannel." into honeycomb-LTE	Wink Saville	2011-05-02	2	-59/+164
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Enhance AsyncChannel.	Wink Saville	2011-05-02	2	-59/+164