frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 77fc8b80 to master	Dianne Hackborn	2011-06-14	1	-22/+134
\|\
\| *	am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation f...	Dianne Hackborn	2011-06-14	1	-22/+134
\| \|\
\| \| *	Add new landscape and portrait orientation features.	Dianne Hackborn	2011-06-14	1	-22/+134
* \| \|	am f14dff12: am c6adfed6: am f795e9a8: Okay now really enforce the limit on...	Dianne Hackborn	2011-06-10	1	-2/+2
\|\ \ \ \| \|/ /
\| * \|	am c6adfed6: am f795e9a8: Okay now really enforce the limit on non-public s...	Dianne Hackborn	2011-06-10	1	-2/+2
\| \|\ \ \| \| \|/
\| \| *	Okay now really enforce the limit on non-public styles.	Dianne Hackborn	2011-06-09	1	-2/+2
* \| \|	am 9980043e: am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.	Dianne Hackborn	2011-06-10	1	-2/+2
\|\ \ \ \| \|/ /
\| * \|	am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.	Dianne Hackborn	2011-06-09	1	-2/+2
\| \|\ \ \| \| \|/
\| \| *	Ummm... f*, stop breaking the build.	Dianne Hackborn	2011-06-09	1	-2/+2
* \| \|	resolved conflicts for merge of f51ded0f to master	Dianne Hackborn	2011-06-10	2	-4/+5
\|\ \ \ \| \|/ /
\| * \|	am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag p...	Dianne Hackborn	2011-06-09	2	-4/+5
\| \|\ \ \| \| \|/
\| \| *	Enforce public resource restriction on bag parents.	Dianne Hackborn	2011-06-09	2	-4/+5
* \| \|	am 48305f32: am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into...	Xavier Ducrohet	2011-06-10	3	-20/+58
\|\ \ \ \| \|/ /
\| * \|	am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2	Xavier Ducrohet	2011-06-09	3	-20/+58
\| \|\ \ \| \| \|/
\| \| *	Merge 06942bc4 from hc-mr1.	Xavier Ducrohet	2011-06-08	2	-4/+9
\| \| *	Merge 988eeeb5 from hc-mr1.	Xavier Ducrohet	2011-06-08	3	-16/+49
* \| \|	am abc83871: am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr...	Xavier Ducrohet	2011-06-07	13	-103/+348
\|\ \ \ \| \|/ /
\| * \|	am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into hone...	Xavier Ducrohet	2011-06-06	13	-103/+348
\| \|\ \ \| \| \|/
\| \| *	Import the Layoutlib from hc-mr1.	Xavier Ducrohet	2011-06-03	13	-103/+348
* \| \|	resolved conflicts for merge of 54cb63e2 to master	Dianne Hackborn	2011-06-02	1	-0/+5
\|\ \ \ \| \|/ /
\| * \|	am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens.	Dianne Hackborn	2011-05-27	1	-0/+5
\| \|\ \ \| \| \|/
\| \| *	Add "tv" density for 720p screens.	Dianne Hackborn	2011-05-27	1	-0/+5
\| * \|	am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability....	Jeff Brown	2011-05-25	1	-0/+289
\| \|\ \ \| \| \|/
\| \| *	Improve VelocityTracker numerical stability. (DO NOT MERGE)	Jeff Brown	2011-05-23	1	-0/+289
* \| \|	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