frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of ad2fa35d to master	Tom Taylor	2009-12-22	2	-2/+2
\|\
\| *	am d4a4729c: Update imports to android-common	Tom Taylor	2009-12-21	2	-2/+2
\| \|\
\| \| *	Update imports to android-common	Tom Taylor	2009-12-21	2	-2/+2
* \| \|	am 451c850f: am 15f1bfb0: Merge change I70d0bddb into eclair-mr2	Kenny Root	2009-12-14	2	-9/+17
\|\ \ \ \| \|/ /
\| * \|	am 15f1bfb0: Merge change I70d0bddb into eclair-mr2	Kenny Root	2009-12-14	2	-9/+17
\| \|\ \ \| \| \|/
\| \| *	Merge change I70d0bddb into eclair-mr2	Android (Google) Code Review	2009-12-14	2	-9/+17
\| \| \|\
\| \| \| *	Revise aapt options for UTF8/16 encoding	Kenny Root	2009-12-11	2	-9/+17
* \| \| \|	am 092de0a9: am a7d461e0: am 62d4395b: Merge change I6dc8a694 into eclair	Xavier Ducrohet	2009-12-13	1	-0/+3
\|\ \ \ \ \| \|/ / /
\| * \| \|	am a7d461e0: am 62d4395b: Merge change I6dc8a694 into eclair	Xavier Ducrohet	2009-12-13	1	-0/+3
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 62d4395b: Merge change I6dc8a694 into eclair	Xavier Ducrohet	2009-12-13	1	-0/+3
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	Layoutlib: Add a constant for default density value.	Xavier Ducrohet	2009-12-11	1	-0/+3
* \| \| \|	am cdbf5746: am b5ef7ee1: Default to UTF8 resources when packaging with aapt	Kenny Root	2009-12-11	2	-3/+37
\|\ \ \ \ \| \|/ / /
\| * \| \|	am b5ef7ee1: Default to UTF8 resources when packaging with aapt	Kenny Root	2009-12-10	2	-3/+37
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Default to UTF8 resources when packaging with aapt	Kenny Root	2009-12-10	2	-3/+37
* \| \| \|	am 926d1a22: am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2	Jean-Baptiste Queru	2009-12-10	3	-6/+25
\|\ \ \ \ \| \|/ / /
\| * \| \|	am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2	Jean-Baptiste Queru	2009-12-10	3	-6/+25
\| \|\ \ \ \| \| \|/ /
\| \| * \|	resolved conflicts for merge of ce307f88 to eclair-mr2	Jean-Baptiste Queru	2009-12-10	3	-6/+25
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Add --custom-package to aapt	Xavier Ducrohet	2009-11-30	3	-6/+25
* \| \| \|	am 5cd6fcd5: am e6c0e993: Merge change I129483f8 into eclair-mr2	Kenny Root	2009-12-10	10	-23/+90
\|\ \ \ \ \| \|/ / /
\| * \| \|	am e6c0e993: Merge change I129483f8 into eclair-mr2	Kenny Root	2009-12-09	10	-23/+90
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Optional use of UTF-8 strings in resource bundles	Kenny Root	2009-12-07	10	-23/+90
\| \| * \|	Fix bitmask in aapt's StringPool length construction	Kenny Root	2009-12-04	1	-1/+1
\| \| \|/
* \| \|	am fe11d1a7: am 43e9eb28: am 9ddb7df8: Fix build.	Dianne Hackborn	2009-11-17	1	-6/+6
\|\ \ \ \| \|/ /
\| * \|	am 43e9eb28: am 9ddb7df8: Fix build.	Dianne Hackborn	2009-11-16	1	-6/+6
\| \|\ \ \| \| \|/
\| \| *	Fix build.	Dianne Hackborn	2009-11-16	1	-6/+6
* \| \|	am 1bd7261d: am 1ddc0077: am 19e420c5: Merge change Iae493184 into eclair	Xavier Ducrohet	2009-11-17	1	-8/+11
\|\ \ \ \| \|/ /
\| * \|	am 1ddc0077: am 19e420c5: Merge change Iae493184 into eclair	Xavier Ducrohet	2009-11-16	1	-8/+11
\| \|\ \ \| \| \|/
\| \| *	Minor fix for the parent style computation in the layoutlib.	Xavier Ducrohet	2009-11-15	1	-8/+11
* \| \|	am 85a612d0: am b2d7c60f: am ae210437: Merge change I7082e366 into eclair	Xavier Ducrohet	2009-11-13	1	-2/+12
\|\ \ \ \| \|/ /
\| * \|	am b2d7c60f: am ae210437: Merge change I7082e366 into eclair	Xavier Ducrohet	2009-11-13	1	-2/+12
\| \|\ \ \| \| \|/
\| \| *	Properly implement Paint.breakText for layoutlib.	Xavier Ducrohet	2009-11-13	1	-2/+12
* \| \|	am eac4222f: am 949ffa3d: am 11cff8cd: Merge change Ie211adae into eclair	Marco Nelissen	2009-11-09	1	-2/+4
\|\ \ \ \| \|/ /
\| * \|	am 949ffa3d: am 11cff8cd: Merge change Ie211adae into eclair	Marco Nelissen	2009-11-09	1	-2/+4
\| \|\ \ \| \| \|/
\| \| *	Add a way for wallpapers to know the delta between virtual screens.	Marco Nelissen	2009-11-09	1	-2/+4
* \| \|	am 3969e50a: am aa10b9fb: am e6ab011b: Merge change Ib12bcb7f into eclair	Xavier Ducrohet	2009-11-09	4	-120/+333
\|\ \ \ \| \|/ /
\| * \|	am aa10b9fb: am e6ab011b: Merge change Ib12bcb7f into eclair	Xavier Ducrohet	2009-11-09	4	-120/+333
\| \|\ \ \| \| \|/
\| \| *	Support for fallback fonts in layoutlib.	Xavier Ducrohet	2009-11-09	4	-120/+333
* \| \|	am 5b40ead8: am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd in...	Dirk Dougherty	2009-11-04	2	-9/+9
\|\ \ \ \| \|/ /
\| * \|	am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdk	Dirk Dougherty	2009-11-04	2	-9/+9
\| \|\ \ \| \| \|/
\| \| *	am 00e44ef2: Merge change I54545dfd into eclair-sdk	Dirk Dougherty	2009-11-04	2	-9/+9
\| \| \|\
\| \| \| *	doc change: fix broken R.styleable formatting (caused by missing periods). Ad...	Dirk Dougherty	2009-11-03	2	-9/+9
* \| \| \|	am 8e59b032: am 4899daa0: am c54e0ce9: Merge change Ia86f2849 into eclair	Brett Chabot	2009-11-03	2	-2/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 4899daa0: am c54e0ce9: Merge change Ia86f2849 into eclair	Brett Chabot	2009-11-03	2	-2/+2
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Fix layoutlib tests so they pas when run from Eclipse workbench.	Brett Chabot	2009-11-03	2	-2/+2
* \| \| \|	am 8368e510: am c6bead14: am 7580493b: Implement feature #2117336: Create eve...	Dianne Hackborn	2009-10-22	1	-0/+19
\|\ \ \ \ \| \|/ / /
\| * \| \|	am c6bead14: am 7580493b: Implement feature #2117336: Create event communicat...	Dianne Hackborn	2009-10-22	1	-0/+19
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Implement feature #2117336: Create event communication APIs for live wallpaper	Dianne Hackborn	2009-10-22	1	-0/+19
\| \| * \|	add "junk path" -k option to aapt (DO NOT MERGE)	Doug Zongker	2009-10-19	3	-8/+22
\| \| \|/
* \| \|	am b80d1d0c: am afbf8afa: Merge change I564b5b00 into eclair-mr2	Doug Zongker	2009-10-13	3	-8/+22
\|\ \ \ \| \|/ /
\| * \|	am afbf8afa: Merge change I564b5b00 into eclair-mr2	Doug Zongker	2009-10-13	3	-8/+22
\| \|\ \