frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Purge Skia objects from GL caches as needed."	Romain Guy	2010-09-08	3	-1/+16
\|\
\| *	Purge Skia objects from GL caches as needed.	Romain Guy	2010-09-08	3	-1/+16
* \|	am 573c5d5e: am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH...	Mike LeBeau	2010-09-08	1	-0/+16
\|\ \
\| * \	am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for o...	Mike LeBeau	2010-09-08	1	-0/+16
\| \|\ \
\| \| * \	Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended sea...	Mike LeBeau	2010-09-08	1	-0/+16
\| \| \|\ \
\| \| \| * \|	Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended	Mike LeBeau	2010-09-08	1	-0/+16
* \| \| \| \|	Merge "Fix bug with LayoutTransition when layouts are just coming on line"	Chet Haase	2010-09-08	1	-1/+5
\|\ \ \ \ \
\| * \| \| \| \|	Fix bug with LayoutTransition when layouts are just coming on line	Chet Haase	2010-09-08	1	-1/+5
* \| \| \| \| \|	Merge "AdapterViewAnimator now properly handles notifyDataSetChanged"	Adam Cohen	2010-09-08	1	-10/+34
\|\ \ \ \ \ \
\| * \| \| \| \| \|	AdapterViewAnimator now properly handles notifyDataSetChanged	Adam Cohen	2010-09-08	1	-10/+34
* \| \| \| \| \| \|	am 3fa7d8af: am 9bfb060a: Merge "Force wallpaper surface to 565." into ginger...	Mathias Agopian	2010-09-08	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am 9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread	Mathias Agopian	2010-09-08	2	-1/+6
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge "Force wallpaper surface to 565." into gingerbread	Mathias Agopian	2010-09-08	2	-1/+6
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| \| \| * \| \| \|	Force wallpaper surface to 565.	Mathias Agopian	2010-09-08	2	-1/+6
* \| \| \| \| \| \|	Merge "Added resources and styles for ActionBar tabs"	Adam Powell	2010-09-08	11	-6/+58
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Added resources and styles for ActionBar tabs	Adam Powell	2010-09-08	11	-6/+58
* \| \| \| \| \| \| \|	am de5cfcb6: am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." i...	Gilles Debunne	2010-09-08	1	-2/+4
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread	Gilles Debunne	2010-09-08	1	-2/+4
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Merge "Fix for a memory leak in TextKeyListener." into gingerbread	Gilles Debunne	2010-09-08	1	-2/+4
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	Fix for a memory leak in TextKeyListener.	Gilles Debunne	2010-09-08	1	-2/+4
* \| \| \| \| \| \| \| \|	Merge "Some cleanup of Proxy class."	Robert Greenwalt	2010-09-08	2	-28/+23
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Some cleanup of Proxy class.	Robert Greenwalt	2010-09-03	2	-28/+23
* \| \| \| \| \| \| \| \| \|	Merge "Fix possible infinite loop when purging textures."	Romain Guy	2010-09-08	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix possible infinite loop when purging textures.	Romain Guy	2010-09-08	1	-0/+5
* \| \| \| \| \| \| \| \|	am 5fdacb8a: am ee455f5a: Merge "People holding partial wake locks now get bl...	Dianne Hackborn	2010-09-08	2	-48/+224
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU ...	Dianne Hackborn	2010-09-08	2	-48/+224
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge "People holding partial wake locks now get blamed for CPU usage." into ...	Dianne Hackborn	2010-09-08	2	-48/+224
\| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	People holding partial wake locks now get blamed for CPU usage.	Dianne Hackborn	2010-09-08	2	-48/+224
* \| \| \| \| \| \| \| \| \|	am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is...	Jake Hamby	2010-09-08	3	-5/+40
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full....	Jake Hamby	2010-09-08	3	-5/+40
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / /
\| \| * \| \| \| \| \| \| \|	Allow incoming SMS until internal storage is almost full.	Jake Hamby	2010-09-08	3	-5/+40
\| \| \|/ / / / / / /
* \| \| \| \| \| \| \| \|	Merge "move recent apps around, attempting to make it not crash."	Joe Onorato	2010-09-08	2	-57/+8
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	move recent apps around, attempting to make it not crash.	Joe Onorato	2010-09-08	2	-57/+8
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	resolved conflicts for merge of a05088c1 to master	Jeff Brown	2010-09-08	7	-10/+144
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| / / / / / / \| \|/ / / / / /
\| * \| \| \| \| \|	am 85a31767: Add support for secure views.	Jeff Brown	2010-09-08	7	-8/+141
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Add support for secure views.	Jeff Brown	2010-09-08	7	-8/+141
\| \| \| \|_\|/ / \| \| \|/\| \| \|
* \| \| \| \| \|	am 6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp	Jean-Baptiste Queru	2010-09-08	15	-3053/+8
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp	Jean-Baptiste Queru	2010-09-08	15	-3053/+8
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Revert "resolve conflicts"	Jean-Baptiste Queru	2010-09-08	15	-3053/+8
* \| \| \| \| \| \|	am c4f628a1: am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRang...	Erik	2010-09-08	1	-8/+53
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into ginge...	Erik	2010-09-08	1	-8/+53
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| / / / / \| \| \|/ / / /
\| \| * \| \| \|	Merge "Adds a time zone parameter to formatDateRange" into gingerbread	Erik	2010-09-08	1	-8/+53
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Adds a time zone parameter to formatDateRange	Erik	2010-09-08	1	-8/+53
\| * \| \| \| \| \|	am 468394fc: Text Selection: smart word detection. DO NOT MERGE.	Gilles Debunne	2010-09-08	1	-11/+87
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Text Selection: smart word detection. DO NOT MERGE.	Gilles Debunne	2010-09-08	1	-11/+87
\| \| \|/ / / /
* \| \| \| \| \|	Merge changes Ib18b93bf,I4c86d7e3	Mike Lockwood	2010-09-08	1	-9/+9
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Rename the media database's "objects" table to "files"	Mike Lockwood	2010-09-08	1	-9/+9
* \| \| \| \| \| \|	am 664c48e9: am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread	Elliott Hughes	2010-09-08	4	-174/+0
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread	Elliott Hughes	2010-09-08	4	-174/+0
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge "Remove dead code: NIOBuffer." into gingerbread	Elliott Hughes	2010-09-08	4	-174/+0
\| \| \|\ \ \ \ \