frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 10d5b096 to master	Dianne Hackborn	2010-10-04	1	-8/+10
\|\
\| *	am 407f625a: Add new API to find out whether external storage is removable.	Dianne Hackborn	2010-10-04	1	-8/+10
\| \|\
\| \| *	Add new API to find out whether external storage is removable.	Dianne Hackborn	2010-10-04	1	-8/+10
* \| \|	Merge "layoutlib_create: Generate delegate to implement native methods."	Raphael	2010-10-04	15	-146/+1139
\|\ \ \
\| * \| \|	layoutlib_create: Generate delegate to implement native methods.	Raphael	2010-09-29	15	-146/+1139
* \| \| \|	am 7e40e67f: am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" ...	Kenny Root	2010-10-01	1	-3/+2
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread	Kenny Root	2010-10-01	1	-3/+2
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Add "none" for vold and deprecate mkobb -c	Kenny Root	2010-10-01	1	-3/+2
* \| \| \|	am 4309b52f: am 735de3b3: Hash keys with MD5; track IBinders not IInterface	Kenny Root	2010-09-30	1	-9/+21
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 735de3b3: Hash keys with MD5; track IBinders not IInterface	Kenny Root	2010-09-30	1	-9/+21
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Hash keys with MD5; track IBinders not IInterface	Kenny Root	2010-09-30	1	-9/+21
* \| \| \|	Drag/drop APIs and infrastructure	Christopher Tate	2010-09-30	1	-0/+35
* \| \| \|	am 0e8dc464: am 292c246b: Merge "Call functions to calculate deps and classes...	Ying Wang	2010-09-28	1	-8/+4
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 292c246b: Merge "Call functions to calculate deps and classes.jar" into gi...	Ying Wang	2010-09-28	1	-8/+4
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Call functions to calculate deps and classes.jar	Ying Wang	2010-09-28	1	-8/+4
\| * \| \|	am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into g...	Dianne Hackborn	2010-09-27	1	-0/+6
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Allow all apps to call ContentResolver.getType().	Dianne Hackborn	2010-09-26	1	-0/+6
* \| \| \|	Merge "Improve error reporting in the layoutlib class replacement test."	Xavier Ducrohet	2010-09-28	1	-3/+39
\|\ \ \ \
\| * \| \| \|	Improve error reporting in the layoutlib class replacement test.	Xavier Ducrohet	2010-09-28	1	-3/+39
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Allow all apps to call ContentResolver.getType().	Dianne Hackborn	2010-09-27	1	-0/+6
\|/ / /
* \| \|	am cb7c5498: am 91512f57: Layoutlib_create: Unittest for ClassHasNativeVisitor.	Raphael	2010-09-24	4	-3/+196
\|\ \ \ \| \|/ /
\| * \|	am 91512f57: Layoutlib_create: Unittest for ClassHasNativeVisitor.	Raphael	2010-09-24	4	-3/+196
\| \|\ \
\| \| * \|	Layoutlib_create: Unittest for ClassHasNativeVisitor.	Raphael	2010-09-24	4	-3/+196
* \| \| \|	am 9c708358: am 37cedce1: Merge "Add an aapt option to allow string variation...	Eric Fischer	2010-09-23	3	-5/+95
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 37cedce1: Merge "Add an aapt option to allow string variations for differe...	Eric Fischer	2010-09-23	3	-5/+95
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Add an aapt option to allow string variations for different devices.	Eric Fischer	2010-09-23	3	-5/+95
* \| \| \|	Merge "Work on fragments in layouts."	Dianne Hackborn	2010-09-21	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Work on fragments in layouts.	Dianne Hackborn	2010-09-21	1	-2/+2
* \| \| \| \|	am 98699c8f: am f2960b8d: Refresh the layoutlib_create doc.	Raphael Moll	2010-09-21	1	-36/+164
\|\ \ \ \ \ \| \|/ / / / \|/\| / / / \| \|/ / /
\| * \| \|	am f2960b8d: Refresh the layoutlib_create doc.	Raphael Moll	2010-09-21	1	-36/+164
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Refresh the layoutlib_create doc.	Raphael Moll	2010-09-21	1	-36/+164
* \| \| \|	am c1558df7: am 34d3aeaf: Merge "Add image creator helper script for OBBs" in...	Kenny Root	2010-09-21	1	-0/+260
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 34d3aeaf: Merge "Add image creator helper script for OBBs" into gingerbread	Kenny Root	2010-09-21	1	-0/+260
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Add image creator helper script for OBBs	Kenny Root	2010-09-21	1	-0/+260
* \| \| \|	am fa888784: am 89fef418: Merge "Avoid pre-processing images when they won\'t...	Xavier Ducrohet	2010-09-10	1	-1/+3
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"	Xavier Ducrohet	2010-09-10	1	-1/+3
\| \|\ \ \ \| \| \|/ / \| \|/\| / \| \| \|/
\| \| *	Avoid pre-processing images when they won't be used	Anthony Newnam	2010-09-03	1	-1/+3
\| \| *	Add a --debug-mode option to aapt.	Xavier Ducrohet	2010-08-31	3	-2/+18
* \| \|	am 31103928: am 192b56d4: Merge "Implement #2964234: Add support for <uses-pa...	Dianne Hackborn	2010-09-02	1	-0/+9
\|\ \ \ \| \|/ /
\| * \|	Implement #2964234: Add support for <uses-package> element to aapt	Dianne Hackborn	2010-09-02	1	-0/+9
* \| \|	am b4649ec7: am 23827557: Merge "Add a --debug-mode option to aapt." into gin...	Xavier Ducrohet	2010-08-31	3	-3/+18
\|\ \ \ \| \|/ /
\| * \|	Add a --debug-mode option to aapt.	Xavier Ducrohet	2010-08-31	3	-3/+18
* \| \|	am eb0e0f46: am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into ...	Kenny Root	2010-08-25	2	-8/+9
\|\ \ \ \| \|/ /
\| * \|	Merge "Add LFH offset to verbose list of APK" into gingerbread	Kenny Root	2010-08-25	2	-8/+9
\| \|\ \
\| \| * \|	Add LFH offset to verbose list of APK	Kenny Root	2010-08-25	2	-8/+9
\| * \| \|	Fix linux 64 build	Brian Carlstrom	2010-08-24	2	-2/+2
\| \|/ /
* \| \|	am 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging to support xlarge scre...	Dianne Hackborn	2010-08-24	1	-0/+9
\|\ \ \
\| * \ \	am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gi...	Dianne Hackborn	2010-08-20	1	-0/+9
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Fix aapt dump badging to support xlarge screens.	Dianne Hackborn	2010-08-20	1	-0/+9
* \| \| \|	am 821afa9a: am 54d41379: Merge "Add OBB flags to support overlays" into ging...	Kenny Root	2010-08-21	1	-11/+10
\|\ \ \ \ \| \|/ / /