frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Style and asset cleanup"	Alan Viverette	2014-05-22	1	-1/+1
\|\
\| *	Style and asset cleanup	Alan Viverette	2014-05-21	1	-1/+1
* \|	Add stream/volume apis to sessions	RoboErik	2014-05-21	1	-0/+15
\|/
*	Merge "Revert "Hide voice interaction APIs.""	Dianne Hackborn	2014-05-21	1	-0/+94
\|\
\| *	Revert "Hide voice interaction APIs."	Dianne Hackborn	2014-05-21	1	-0/+94
* \|	Merge "Remove @hide from IN_DEFAULT_DIRECTORY"	Brian Attwell	2014-05-21	1	-0/+1
\|\ \ \| \|/ \|/\|
\| *	Remove @hide from IN_DEFAULT_DIRECTORY	Brian Attwell	2014-04-21	1	-0/+1
* \|	Merge "Addressing APIs council feedback"	Svetoslav	2014-05-21	1	-2/+2
\|\ \
\| * \|	Addressing APIs council feedback	Svetoslav	2014-05-21	1	-2/+2
* \| \|	Simplify NotificationListenerService API	Christoph Studer	2014-05-21	1	-4/+2
\|/ /
* \|	Merge "Change method name per API council request"	Craig Mautner	2014-05-21	1	-1/+1
\|\ \
\| * \|	Change method name per API council request	Craig Mautner	2014-05-19	1	-1/+1
* \| \|	Make Wifi WPS API available on application layer	Vinit Deshpande	2014-05-20	1	-0/+23
* \| \|	Merge "Validate RenderScript context creation flags"	Jason Sams	2014-05-21	1	-2/+2
\|\ \ \
\| * \| \|	Validate RenderScript context creation flags	Jason Sams	2014-05-20	1	-2/+2
* \| \| \|	Merge "Hotspot 2.0 framework - add implementation"	Yuhao Zheng	2014-05-21	1	-98/+15
\|\ \ \ \
\| * \| \| \|	Hotspot 2.0 framework - add implementation	Roger Chang	2014-05-20	1	-98/+15
* \| \| \| \|	Add scan response as an advertising parameter(1/2).	Wei Wang	2014-05-20	1	-0/+2
* \| \| \| \|	am 08a8c2ca: am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-...	Griff Hazen	2014-05-21	1	-5/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev	Griff Hazen	2014-05-21	1	-5/+5
\| \|\ \ \ \
\| \| * \| \| \|	Fixes to WearableActionExtensions	Griff Hazen	2014-05-20	1	-5/+5
* \| \| \| \| \|	Merge "resolved conflicts for merge of cbe69ec1 to master"	Griff Hazen	2014-05-20	1	-0/+74
\|\ \ \ \ \ \
\| * \ \ \ \ \	resolved conflicts for merge of cbe69ec1 to master	Griff Hazen	2014-05-20	1	-0/+74
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| / / / \| \| \|_\|/ / / \| \|/\| \| \| \|
\| \| * \| \| \|	am 7ea18e1c: Add wearable notification extensions to frameworks/base.	Griff Hazen	2014-05-20	1	-0/+74
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Add wearable notification extensions to frameworks/base.	Griff Hazen	2014-05-20	1	-0/+74
* \| \| \| \| \|	Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class.""	Andres Morales	2014-05-20	1	-6/+0
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Revert "Adding INfcUnlockSettings and NfcUnlock interface class."	Andres Morales	2014-05-20	1	-6/+0
* \| \| \| \| \|	Merge "Clean up Outline API, method on drawable"	Chris Craik	2014-05-20	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Clean up Outline API, method on drawable	Chris Craik	2014-05-20	1	-2/+2
* \| \| \| \| \| \|	Merge "Update FingerprintManager API after discussions."	Jim Miller	2014-05-20	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Update FingerprintManager API after discussions.	Jim Miller	2014-05-19	1	-1/+1
* \| \| \| \| \| \| \|	Merge "Per-user telephony restrictions"	Amith Yamasani	2014-05-20	1	-0/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Per-user telephony restrictions	Amith Yamasani	2014-05-20	1	-0/+1
* \| \| \| \| \| \| \| \|	Merge "Add Device/Profile Owner gated apis for setting/getting blocked packag...	Julia Reynolds	2014-05-20	1	-0/+3
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add Device/Profile Owner gated apis for setting/getting blocked packages.	Julia Reynolds	2014-05-20	1	-0/+3
* \| \| \| \| \| \| \| \| \|	Merge "Allow device/profile owners to update settings."	Julia Reynolds	2014-05-20	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Allow device/profile owners to update settings.	Julia Reynolds	2014-05-20	1	-0/+2
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge "Add getMediaSession to RCC"	RoboErik	2014-05-20	1	-0/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add getMediaSession to RCC	RoboErik	2014-05-20	1	-0/+1
* \| \| \| \| \| \| \| \| \|	resolved conflicts for merge of 8f1e7ade to master	Griff Hazen	2014-05-20	1	-1/+44
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| / / / / \| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	am 5cadc3b0: Add RemoteInput, Grouping, and Extender to Notification api.	Griff Hazen	2014-05-20	1	-1/+44
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add RemoteInput, Grouping, and Extender to Notification api.	Griff Hazen	2014-05-20	1	-1/+44
* \| \| \| \| \| \| \| \|	Merge "USB: Minor cleanup from API council review"	Mike Lockwood	2014-05-20	1	-3/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	USB: Minor cleanup from API council review	Mike Lockwood	2014-05-20	1	-3/+2
* \| \| \| \| \| \| \| \| \|	resolved conflicts for merge of ecf09321 to master	Ben Murdoch	2014-05-20	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	am e0d6a6b0: Merge "Add PackagManager flag for WebView system feature." into ...	Ben Murdoch	2014-05-20	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add PackagManager flag for WebView system feature.	Ben Murdoch	2014-05-19	1	-0/+1
* \| \| \| \| \| \| \| \| \|	Revert "Various API council fixes to drawables"	Alan Viverette	2014-05-20	1	-0/+10
* \| \| \| \| \| \| \| \| \|	Merge "Various API council fixes to drawables"	Alan Viverette	2014-05-20	1	-10/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Various API council fixes to drawables	Alan Viverette	2014-05-20	1	-10/+1