frameworks_base.git - frameworks/base

	Commit message (Collapse)	Author	Age	Files	Lines
*	am d592714d: am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1	Fred Chung	2011-11-17	2	-0/+10
\|\ \| \| \| \| \| \| \| \|	* commit 'd592714d9a48afce69d6904fc539f150b7c02898': Bluetooth HDP sample.
\| *	Merge "Bluetooth HDP sample." into ics-mr1	Fred Chung	2011-11-16	2	-0/+10
\| \|\
\| \| *	Bluetooth HDP sample.	Fred Chung	2011-11-14	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
* \| \|	am df1aba0a: am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code ↵	Bill Gruber	2011-11-15	1	-5/+5
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	snippet Bug 5221766" into ics-mr0 * commit 'df1aba0a9d25a0f9d38593d369ba963dfcd45866': IAB Doc Fix: Error in code snippet Bug 5221766
\| * \|	am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0	Bill Gruber	2011-11-15	1	-5/+5
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b': IAB Doc Fix: Error in code snippet Bug 5221766
\| \| * \	Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0	Bill Gruber	2011-11-15	1	-5/+5
\| \| \|\ \
\| \| \| * \|	IAB Doc Fix: Error in code snippet	Bill Gruber	2011-11-15	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug 5221766 Change-Id: I7af624ed69526b545c97d1419e08f60c92b79d8e
* \| \| \| \|	am 7456cf0a: am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best ↵	Adrian Ludwig	2011-11-15	2	-0/+776
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Practices" to the html docs." into ics-mr0 * commit '7456cf0a125b47860a43d9915bae69b5ef374703': Adding new "Security Best Practices" to the html docs.
\| * \| \| \|	am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." ↵	Adrian Ludwig	2011-11-15	2	-0/+776
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| / \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	into ics-mr0 * commit '0fd69ff4b9311c6b5406b769d50c9aa22787b816': Adding new "Security Best Practices" to the html docs.
\| \| * \|	Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0	Adrian Ludwig	2011-11-15	2	-0/+776
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	Adding new "Security Best Practices" to the html docs.	Adrian Ludwig	2011-11-08	2	-0/+776
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iada088b23c4709e9c9212f41724f99f4e0fa393e
\| * \| \|	am 19b1c12b: Merge "Docs: update state list drawable with state_activated ↵	Scott Main	2011-11-11	1	-6/+16
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and revise selected/focused" into ics-mr0 * commit '19b1c12b5eb3417e9f56810cc08ee1e560da0a99': Docs: update state list drawable with state_activated and revise selected/focused
\| * \| \|	am 5f8b7269: docs: fix typo	Robert Ly	2011-11-11	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '5f8b7269d66acb45dcb74a1eb38102cb1d1431df': docs: fix typo
\| * \ \ \	am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0	Robert Ly	2011-11-11	2	-10/+316
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '5ad6f646fbe692b94961df6472bec2b8bd1ea382': docs: ndk r7 rel notes
* \| \ \ \ \	am 30870e32: am 19b1c12b: Merge "Docs: update state list drawable with ↵	Scott Main	2011-11-11	1	-6/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	state_activated and revise selected/focused" into ics-mr0 * commit '30870e32de4d7338d0aa957458ec63df9806f9da': Docs: update state list drawable with state_activated and revise selected/focused
\| * \ \ \ \ \	am 19b1c12b: Merge "Docs: update state list drawable with state_activated ↵	Scott Main	2011-11-11	1	-6/+16
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and revise selected/focused" into ics-mr0 * commit '19b1c12b5eb3417e9f56810cc08ee1e560da0a99': Docs: update state list drawable with state_activated and revise selected/focused
\| \| * \| \| \| \|	Merge "Docs: update state list drawable with state_activated and revise ↵	Scott Main	2011-11-11	1	-6/+16
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	selected/focused" into ics-mr0
\| \| \| * \| \| \|	Docs: update state list drawable with state_activated and revise ↵	Scott Main	2011-11-11	1	-6/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	selected/focused Change-Id: I6bd919fc71a74fc8135ed333c93d187e0d9e9d80
* \| \| \| \| \| \|	am 2dd19b44: am 5f8b7269: docs: fix typo	Robert Ly	2011-11-11	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '2dd19b4456450706d78f409b526cb6a9979a5f33': docs: fix typo
\| * \| \| \| \| \|	am 5f8b7269: docs: fix typo	Robert Ly	2011-11-11	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '5f8b7269d66acb45dcb74a1eb38102cb1d1431df': docs: fix typo
\| \| * \| \| \| \|	docs: fix typo	Robert Ly	2011-11-11	1	-1/+1
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I86ebd8bced2ca133fc6faff43c2e69205f0c9862
* \| \| \| \| \|	am 6be50a40: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0	Robert Ly	2011-11-11	2	-10/+316
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '6be50a40549a16a3aa3fc1d4360483ab3e898501': docs: ndk r7 rel notes
\| * \| \| \| \|	am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0	Robert Ly	2011-11-11	2	-10/+316
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| / / \| \| \|_\|/ / \| \|/\| \| \|	* commit '5ad6f646fbe692b94961df6472bec2b8bd1ea382': docs: ndk r7 rel notes
\| \| * \| \|	Merge "docs: ndk r7 rel notes" into ics-mr0	Robert Ly	2011-11-11	2	-10/+316
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| \| * \|	docs: ndk r7 rel notes	Robert Ly	2011-11-03	2	-10/+316
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ifbbaa6d1105281db7b1dbab720b19882e3295583
* \| \| \| \|	am e36263be: am 49654c72: am 921afe39: Doc change: new Calendar content ↵	Katie McCormick	2011-11-10	5	-2/+3233
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	provider doc * commit 'e36263be662d8ebac260e81f1fbac356a8362691': Doc change: new Calendar content provider doc
\| * \| \| \|	am 921afe39: Doc change: new Calendar content provider doc	Katie McCormick	2011-11-10	5	-2/+3233
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '921afe39d6041b06c6a002b08f9dcd1561a9ae99': Doc change: new Calendar content provider doc
\| \| * \| \|	Doc change: new Calendar content provider doc	Katie McCormick	2011-11-10	5	-2/+3233
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I9493b6b0cd17ddf8fda07c32aed9b4fa2b8c1489
* \| \| \| \|	am 07e95523: am 69db5695: am bd4bdbec: Merge "docs: update samples toc for ↵	Robert Ly	2011-11-10	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rs sample" into ics-mr0 * commit '07e9552308a1ba49312931b193c06cb6ba822d22': docs: update samples toc for rs sample
\| * \| \| \|	am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0	Robert Ly	2011-11-09	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'bd4bdbec62776b1222b1f202e44f8f127bfb7bab': docs: update samples toc for rs sample
\| \| * \| \|	Merge "docs: update samples toc for rs sample" into ics-mr0	Robert Ly	2011-11-09	1	-1/+1
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| \| * \|	docs: update samples toc for rs sample	Robert Ly	2011-11-02	1	-1/+1
\| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I88216069bc8d6123d031098fad8bf4ed99686bb9
* \| \| \|	am 6d77ad80: am 6c5951bf: Doc change: Updating device-admin with camera info.	Katie McCormick	2011-11-04	3	-129/+118
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* commit '6d77ad80375a82b97aefb7d5ab547a2944135edf': Doc change: Updating device-admin with camera info.
\| * \| \|	am 6c5951bf: Doc change: Updating device-admin with camera info.	Katie McCormick	2011-11-04	3	-129/+118
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* commit '6c5951bf9798369d335096f1f73ee1299cf903ff': Doc change: Updating device-admin with camera info.
\| \| * \|	Doc change: Updating device-admin with camera info.	Katie McCormick	2011-11-03	3	-129/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I5a5bf50b1362346f0a245ee40248a62a3c94a879
* \| \| \|	am cbf1437c: am 95142919: docs: dashboard update for 11/3	Scott Main	2011-11-03	3	-23/+23
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'cbf1437c9dc3080d4faa79be8612c3ef7387515e': docs: dashboard update for 11/3
\| * \| \|	am 95142919: docs: dashboard update for 11/3	Scott Main	2011-11-03	3	-23/+23
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* commit '9514291901e3a1274e30c2e809ad38e22e7f662e': docs: dashboard update for 11/3
\| \| * \|	docs: dashboard update for 11/3	Scott Main	2011-11-03	3	-23/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I06428f0a6ae1d905058338bc9bbc584035af1a5f
\| \| * \|	Merge "Doc change: Update instructions to match ICS UI" into ics-mr0	Katie McCormick	2011-11-02	1	-4/+7
\| \| \|\ \
\| \| \| * \|	Doc change: Update instructions to match ICS UI	Katie McCormick	2011-11-02	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I565ef27401d169ff28b21f1679e56a725c1ac470
* \| \| \| \|	am 31a05f33: Doc change: Update instructions to match ICS UI	Katie McCormick	2011-11-03	1	-4/+7
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '31a05f336ac99ab4ecfb5e227aca40f8fc7140cb': Doc change: Update instructions to match ICS UI
\| * \| \| \|	Doc change: Update instructions to match ICS UI	Katie McCormick	2011-11-02	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I565ef27401d169ff28b21f1679e56a725c1ac470
* \| \| \| \|	am 42774dec: am aea8d850: docs: a couple typos bugs 5552478 5553096	Scott Main	2011-11-02	1	-2/+2
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '42774decd903d0bbd1c57c9aa829719f2a683231': docs: a couple typos bugs 5552478 5553096
\| * \| \| \|	am aea8d850: docs: a couple typos bugs 5552478 5553096	Scott Main	2011-11-02	1	-2/+2
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'aea8d8500395f7e7dce3f670933f7aaf02be7b11': docs: a couple typos bugs 5552478 5553096
\| \| * \| \|	docs: a couple typos	Scott Main	2011-11-02	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bugs 5552478 5553096 Change-Id: Ibeafacd446edf99096e125f5dfaa7c13a6ab1776
* \| \| \| \|	am 46a10ee0: am d5b25ecc: Merge "Doc Update: Update list of widget classes" ↵	Katie McCormick	2011-11-02	1	-0/+4
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into ics-mr0 * commit '46a10ee08d0e51c97923c8e3c54513d228b42467': Doc Update: Update list of widget classes
\| * \| \| \|	am d5b25ecc: Merge "Doc Update: Update list of widget classes" into ics-mr0	Katie McCormick	2011-11-02	1	-0/+4
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'd5b25ecc07efb9d7f725731f29241217266b4c0c': Doc Update: Update list of widget classes
\| \| * \| \|	Merge "Doc Update: Update list of widget classes" into ics-mr0	Katie McCormick	2011-11-01	1	-0/+4
\| \| \|\ \ \
\| \| \| * \| \|	Doc Update: Update list of widget classes	Katie McCormick	2011-11-01	1	-0/+4
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I820848b45e991be6e5b7e7bc2f280caf60fb7f7e
* \| \| \| \|	am 62015f5d: am aeb11b59: Merge "Folding Accessibility Service sample into ↵	Svetoslav Ganov	2011-11-01	1	-10/+0
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ApiDemos." into ics-mr0 * commit '62015f5d0d1104dfc682b3eb3b6c0be4f63b985a': Folding Accessibility Service sample into ApiDemos.