frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Format the xml files for the VectorDrawableTest"	ztenghui	2014-04-24	19	-465/+471
\|\
\| *	Format the xml files for the VectorDrawableTest	ztenghui	2014-04-24	19	-465/+471
* \|	Merge "Add floats-only drawRoundRect to Canvas"	Chris Craik	2014-04-24	4	-15/+24
\|\ \
\| * \|	Add floats-only drawRoundRect to Canvas	Chris Craik	2014-04-24	4	-15/+24
* \| \|	Merge "PackageManager: remove GET_CERTIFICATES boolean"	Kenny Root	2014-04-24	1	-23/+19
\|\ \ \
\| * \| \|	PackageManager: remove GET_CERTIFICATES boolean	Kenny Root	2014-04-24	1	-23/+19
* \| \| \|	Merge "Add text view for double-tap and unlock hint on Keyguard."	Jorim Jaggi	2014-04-24	5	-1/+118
\|\ \ \ \
\| * \| \| \|	Add text view for double-tap and unlock hint on Keyguard.	Jorim Jaggi	2014-04-24	5	-1/+118
* \| \| \| \|	Merge "Fix api."	Dianne Hackborn	2014-04-24	1	-1/+0
\|\ \ \ \ \
\| * \| \| \| \|	Fix api.	Dianne Hackborn	2014-04-24	1	-1/+0
* \| \| \| \| \|	Merge "API tweaks for network score settings."	Jeff Davidson	2014-04-24	2	-18/+16
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	API tweaks for network score settings.	Jeff Davidson	2014-04-24	2	-18/+16
* \| \| \| \| \|	am 69ee6b0a: am 140dc63f: am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEN...	Nick Kralevich	2014-04-24	0	-0/+0
\|\ \ \ \ \ \
\| * \ \ \ \ \	am 140dc63f: am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability ...	Nick Kralevich	2014-04-24	0	-0/+0
\| \|\ \ \ \ \ \
\| \| * \ \ \ \ \	am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system se...	Nick Kralevich	2014-04-24	1	-0/+1
\| \| \|\ \ \ \ \ \
\| \| \| * \ \ \ \ \	Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"	Nick Kralevich	2014-04-24	1	-0/+1
\| \| \| \|\ \ \ \ \ \
\| \| \| \| * \| \| \| \| \|	Zygote: enable CAP_BLOCK_SUSPEND capability for system server	Daniel Leung	2014-04-24	1	-0/+1
* \| \| \| \| \| \| \| \| \|	Merge "Start collecting mobile radio activity from the radio."	Dianne Hackborn	2014-04-24	11	-173/+364
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Start collecting mobile radio activity from the radio.	Dianne Hackborn	2014-04-24	11	-173/+364
* \| \| \| \| \| \| \| \| \| \|	Merge "Nested scrolling!"	Adam Powell	2014-04-24	9	-28/+616
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Nested scrolling!	Adam Powell	2014-04-24	9	-28/+616
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Shoot the rays to the vertices of the incoming polygon."	ztenghui	2014-04-24	3	-6/+86
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Shoot the rays to the vertices of the incoming polygon.	ztenghui	2014-04-24	3	-6/+86
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Take screenshots of pausing activity"	Craig Mautner	2014-04-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Take screenshots of pausing activity	Craig Mautner	2014-04-24	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \|	resolved conflicts for merge of f8a58208 to master	Craig Mautner	2014-04-24	5	-3/+26
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / \|/\| \| \| \| / / / / / / / / \| \| \|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev	Craig Mautner	2014-04-24	5	-3/+26
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \	Merge "Add activity attribute allowEmbedded" into klp-modular-dev	Craig Mautner	2014-04-24	5	-3/+26
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Add activity attribute allowEmbedded	Craig Mautner	2014-04-24	5	-3/+26
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix two potential NPEs in DeviceInfo"	Alexandra Gherghina	2014-04-24	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix two potential NPEs in DeviceInfo	Alexandra Gherghina	2014-04-24	2	-3/+3
* \| \| \| \| \| \| \| \| \| \| \| \| \|	am 07bed492: am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextV...	Raph Levien	2014-04-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| / / / / \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp...	Raph Levien	2014-04-24	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev	Raph Levien	2014-04-24	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Fix bug 14276128 Clipping at bottom of TextView	Raph Levien	2014-04-23	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \|	am 0fc5f869: am e597d5f9: Merge "Use rotation to position circular display ma...	Michael Kolb	2014-04-24	2	-7/+27
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \| \| \| \| \| \| / / / / / / / / \| \|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	am e597d5f9: Merge "Use rotation to position circular display mask" into klp-...	Michael Kolb	2014-04-24	2	-7/+27
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge "Use rotation to position circular display mask" into klp-modular-dev	Michael Kolb	2014-04-24	2	-7/+27
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Use rotation to position circular display mask	Michael Kolb	2014-04-24	2	-7/+27
\| \| \| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix bug with getLauncherActivities ignoring packageName."	Kenny Guy	2014-04-24	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug with getLauncherActivities ignoring packageName.	Kenny Guy	2014-04-24	1	-0/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \|	am d0af9589: (-s ours) am aed314e8: (-s ours) Merge "Import translations. DO ...	Baligh Uddin	2014-04-24	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	am aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-mod...	Baligh Uddin	2014-04-24	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge "Import translations. DO NOT MERGE" into klp-modular-dev	Baligh Uddin	2014-04-24	27	-58/+31
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-04-23	27	-58/+31
\| \| \| \| \|/ / / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	am 7e28afd9: am 7d2d2272: Merge "Force ActivityView activities to start in ne...	Craig Mautner	2014-04-24	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \|	am 7d2d2272: Merge "Force ActivityView activities to start in new task" into ...	Craig Mautner	2014-04-24	1	-1/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge "Force ActivityView activities to start in new task" into klp-modular-dev	Craig Mautner	2014-04-24	1	-1/+4
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Force ActivityView activities to start in new task	Craig Mautner	2014-04-23	1	-1/+4
\| \| \| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	am 56cc5ba7: am 8d47f23e: am dbb0de21: Merge "Fix a typo in an assertion."	Elliott Hughes	2014-04-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \| \| \| \| \| / / / / / / / / \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|