frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of bbca8133 to master	Dianne Hackborn	2011-05-24	1	-0/+5
\|\
\| *	am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2	Dianne Hackborn	2011-05-23	1	-0/+5
\| \|\
\| \| *	Add "television" mode.	Dianne Hackborn	2011-05-23	1	-0/+5
* \| \|	resolved conflicts for merge of 06a8ceac to master	Dianne Hackborn	2011-05-19	3	-45/+111
\|\ \ \ \| \|/ /
\| * \|	am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.	Dianne Hackborn	2011-05-19	3	-45/+111
\| \|\ \ \| \| \|/
\| \| *	Add new "-swNNNdp" resource qualifier.	Dianne Hackborn	2011-05-19	3	-45/+111
* \| \|	am a13462a9: am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support...	Xavier Ducrohet	2011-05-19	3	-21/+33
\|\ \ \ \| \|/ /
\| * \|	am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new base...	Xavier Ducrohet	2011-05-18	3	-21/+33
\| \|\ \ \| \| \|/
\| \| *	am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." in...	Xavier Ducrohet	2011-05-18	3	-21/+33
\| \| \|\
\| \| \| *	LayoutLib: support the new baseline/margin query API.	Xavier Ducrohet	2011-05-16	3	-21/+33
* \| \| \|	am d0054160: am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data...	Xavier Ducrohet	2011-05-13	11	-52/+799
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for ...	Xavier Ducrohet	2011-05-13	11	-52/+799
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 2fae858d: LayoutLib: implement data binding for most AdapterView	Xavier Ducrohet	2011-05-13	11	-52/+799
\| \| \|\ \ \| \| \| \|/
\| \| \| *	LayoutLib: implement data binding for most AdapterView	Xavier Ducrohet	2011-05-13	11	-52/+799
\| * \| \|	am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen widt...	Dianne Hackborn	2011-05-13	3	-12/+137
\| \|\ \ \ \| \| \|/ /
\| \| * \|	DO NOT MERGE. Integrate add new screen width/height in "dp" configs.	Dianne Hackborn	2011-05-12	3	-12/+137
\| \| \|/
* \| \|	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