frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 18490fb9 to master	Kenny Root	2011-04-12	3	-1/+12
\|\
\| *	resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp	Kenny Root	2011-04-12	3	-1/+12
\| \|\
\| \| *	am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."	Kenny Root	2011-04-11	3	-1/+12
\| \| \|\
\| \| \| *	Runtime resource overlay, iteration 1.	Mårten Kongstad	2011-04-01	3	-1/+12
\| \| * \|	am 59aad78e: LayoutLib: don\'t render when shader\'s local matrix is set to 0...	Xavier Ducrohet	2011-04-06	2	-18/+35
\| \| \|\ \
\| \| \| * \|	LayoutLib: don't render when shader's local matrix is set to 0 scale.	Xavier Ducrohet	2011-04-06	2	-18/+35
\| \| * \| \|	am 8a18dba4: Merge c5aeac7f from honeycomb.	Xavier Ducrohet	2011-04-06	1	-23/+75
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge c5aeac7f from honeycomb.	Xavier Ducrohet	2011-04-06	1	-23/+75
\| \| * \| \|	am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.	Xavier Ducrohet	2011-03-17	1	-11/+4
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge 67450db0 from honeycomb. Do not merge.	Xavier Ducrohet	2011-03-17	1	-11/+4
\| \| * \| \|	am 0a98226e: Merge 9d76581f from honeycomb. do not merge.	Xavier Ducrohet	2011-03-15	2	-30/+52
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge 9d76581f from honeycomb. do not merge.	Xavier Ducrohet	2011-03-15	2	-30/+52
\| \| * \| \|	am b243aabd: Merge adaa12cd from honeycomb. do not merge.	Xavier Ducrohet	2011-03-15	3	-12/+23
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge adaa12cd from honeycomb. do not merge.	Xavier Ducrohet	2011-03-15	3	-12/+23
\| \| * \| \|	am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into ginger...	Xavier Ducrohet	2011-03-15	2	-14/+10
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge 6f2fb570 from honeycomb. do not merge.	Xavier Ducrohet	2011-03-14	2	-14/+10
\| \| * \| \|	am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into ginger...	Xavier Ducrohet	2011-03-15	1	-25/+80
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge c12b4093 from honeycomb. do not merge.	Xavier Ducrohet	2011-03-14	1	-25/+80
\| \| * \| \|	am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into ging...	Xavier Ducrohet	2011-02-28	12	-66/+67
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge 1911a6f7 into gingerbread. do not merge.	Xavier Ducrohet	2011-02-25	12	-66/+67
\| * \| \| \|	Merge 59aad78e from master. do not merge.	Xavier Ducrohet	2011-04-07	2	-19/+36
* \| \| \| \|	am d7765e35: am 73dc2602: am c5aeac7f: LayoutLib: Fix issue with rendering mode.	Xavier Ducrohet	2011-04-06	1	-23/+75
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	LayoutLib: Fix issue with rendering mode.	Xavier Ducrohet	2011-04-05	1	-23/+75
* \| \| \| \|	Add new resource configurations for screen width/height in "dp".	Dianne Hackborn	2011-04-06	3	-12/+134
* \| \| \| \|	am 47b42991: am a0215953: am 026d6be2: Merge "LayoutLib: TypedArray.getDimens...	Xavier Ducrohet	2011-03-17	1	-11/+4
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	LayoutLib: TypedArray.getDimensionPixelSize can actually return <0	Xavier Ducrohet	2011-03-17	1	-11/+4
* \| \| \| \|	Merge "Improve VelocityTracker numerical stability."	Jeff Brown	2011-03-15	1	-0/+289
\|\ \ \ \ \
\| * \| \| \| \|	Improve VelocityTracker numerical stability.	Jeff Brown	2011-03-15	1	-0/+289
* \| \| \| \| \|	Merge "Add screen layout size as one of the resource filtering axes."	Ying Wang	2011-03-14	1	-0/+3
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Add screen layout size as one of the resource filtering axes.	Ying Wang	2011-03-14	1	-0/+3
\| \|/ / / /
* \| \| \| \|	LayoutLib: Fix Arc rendering.	Xavier Ducrohet	2011-03-14	2	-30/+52
\|/ / / /
* \| \| \|	LayoutLib: fix Capabilities and getDimensionPixelSize	Xavier Ducrohet	2011-03-08	3	-12/+23
* \| \| \|	LayoutLib: Fix dimension parsing to handle negative value.	Xavier Ducrohet	2011-03-07	2	-14/+10
* \| \| \|	LayoutLib: Implement some missing add###() method in Path.	Xavier Ducrohet	2011-03-07	1	-25/+80
* \| \| \|	Fix issue #3485923: Gmail crash	Dianne Hackborn	2011-03-02	1	-0/+4
* \| \| \|	Add notice files for aapt and aidl.	Xavier Ducrohet	2011-02-28	2	-0/+380
* \| \| \|	am b732b7b5: am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant...	Xavier Ducrohet	2011-02-28	3	-6/+20
\|\ \ \ \
\| * \ \ \	am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."	Xavier Ducrohet	2011-02-28	3	-6/+20
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."	Xavier Ducrohet	2011-02-28	3	-6/+20
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	am dff6b8e7: Merge "Add --non-constant-id to aapt."	Xavier Ducrohet	2011-02-28	3	-6/+20
\| \| \| \|\ \
\| \| \| \| * \|	Add --non-constant-id to aapt.	Xavier Ducrohet	2011-02-14	3	-6/+20
\| \| * \| \| \|	am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." i...	Xavier Ducrohet	2011-02-24	40	-1422/+296
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| \| * \| \|	LayoutLib: Adapt the HC layoutlib to GB. do not merge.	Xavier Ducrohet	2011-02-23	40	-1422/+296
\| * \| \| \| \|	resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp	Xavier Ducrohet	2011-02-24	61	-539/+1436
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp	Xavier Ducrohet	2011-02-24	138	-8365/+17266
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| / / \| \| \| \|/ / \| \| \|/\| \|
\| \| \| * \|	LayoutLib: Original import of Honeycomb's layoutlib. do not merge.	Xavier Ducrohet	2011-02-23	141	-8401/+17623
* \| \| \| \|	LayoutLib: fix incorrect indices in one of the 2 native_drawTextRun methods.	Xavier Ducrohet	2011-02-24	1	-3/+2
* \| \| \| \|	LayoutLib: move tests to their own project.	Xavier Ducrohet	2011-02-24	12	-66/+67
* \| \| \| \|	LayoutLib: Add debug mode.	Xavier Ducrohet	2011-02-23	16	-14/+62
* \| \| \| \|	LayoutLib: downsize the SparseArray when possible.	Xavier Ducrohet	2011-02-23	1	-3/+11