frameworks_base.git - frameworks/base

	Commit message (Collapse)	Author	Age	Files	Lines
*	am d3b2d050: am 674b1fcb: Doc change: Update cards and landing contents.	Dirk Dougherty	2015-05-09	23	-47/+149
\|\ \| \| \| \| \| \| \| \|	* commit 'd3b2d0502dd30039789f2a2b6380a4344fdc865e': Doc change: Update cards and landing contents.
\| *	am 674b1fcb: Doc change: Update cards and landing contents.	Dirk Dougherty	2015-05-09	23	-47/+149
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '674b1fcbaae2142666a6fb8eea4595fa8c64e406': Doc change: Update cards and landing contents.
\| \| *	Doc change: Update cards and landing contents.	Dirk Dougherty	2015-05-08	23	-47/+149
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iecb6a6aa0fd3835750979bea49ac782abaa3364a
* \| \|	Merge "Switch to KeyguardManager.isDeviceSecure." into mnc-dev	Alex Klyubin	2015-05-08	1	-1/+1
\|\ \ \
\| * \| \|	Switch to KeyguardManager.isDeviceSecure.	Alex Klyubin	2015-05-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	isKeyguardSecure also returns true when SIM PIN is required. We don't care about that because entering SIM PIN does not unlock keys requiring user authentication. isDeviceSecure returns true only if secure lock screen is set up, which is exactly what we want. Bug: 18088752 Change-Id: I47b21f3351f55c11e8e9bcfd7654762973dd9271
* \| \| \|	am 4e19b9a0: am 27e82e7b: Merge "Doc change: remove design content that has ↵	Dirk Dougherty	2015-05-08	32	-4319/+26
\|\ \ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	moved to material spec." into mnc-preview-docs * commit '4e19b9a01e1a9b37aa4b2b02ff2baac764824a33': Doc change: remove design content that has moved to material spec.
\| * \| \|	am 27e82e7b: Merge "Doc change: remove design content that has moved to ↵	Dirk Dougherty	2015-05-08	32	-4319/+26
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	material spec." into mnc-preview-docs * commit '27e82e7b3824b886ae1179c58c2f7073831d6c6a': Doc change: remove design content that has moved to material spec.
\| \| * \|	Merge "Doc change: remove design content that has moved to material spec." ↵	Dirk Dougherty	2015-05-08	32	-4319/+26
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mnc-preview-docs
\| \| \| * \|	Doc change: remove design content that has moved to material spec.	Dirk Dougherty	2015-05-05	32	-4319/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I335e3386633ae1e95891980b225885f5fed219b0
* \| \| \| \|	am 259a73b5: am b2152a43: am 1dc26b8c: docs: remove obsolete renderscript ↵	Joe Fernandez	2015-05-08	1	-21/+0
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| / \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	reference framer page * commit '259a73b560b3acbd653167b2617810920a6f4b22': docs: remove obsolete renderscript reference framer page
\| * \| \|	am b2152a43: am 1dc26b8c: docs: remove obsolete renderscript reference ↵	Joe Fernandez	2015-05-07	1	-21/+0
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	framer page * commit 'b2152a43ea8b44772fab5d29dea436f2a4ddc89b': docs: remove obsolete renderscript reference framer page
\| \| * \|	am 1dc26b8c: docs: remove obsolete renderscript reference framer page	Joe Fernandez	2015-05-07	1	-21/+0
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '1dc26b8c1eaa6b5aa288cecf9202e77217507fd3': docs: remove obsolete renderscript reference framer page
\| \| \| * \|	docs: remove obsolete renderscript reference framer page	Joe Fernandez	2015-05-07	1	-21/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I9ec7ad462584d2e2b7132b1ddbf9306c9df83b10
* \| \| \| \|	am b53420d0: am e7866887: docs: M Preview landing page	Joe Fernandez	2015-05-07	7	-7/+85
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'b53420d02def4277cf5b8a04da289b4291a9f24a': docs: M Preview landing page
\| * \| \| \|	am e7866887: docs: M Preview landing page	Joe Fernandez	2015-05-07	7	-7/+85
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'e78668876ed0dfc25fac604b5048509f72d92c53': docs: M Preview landing page
\| \| * \| \|	docs: M Preview landing page	Joe Fernandez	2015-05-06	7	-7/+85
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Change-Id: Ib0e49713f105823898ca5f76d6d6eb4fad54df5e
* \| \| \|	am 34e0f640: am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle ↵	Rich Slogar	2015-05-06	1	-8/+18
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	multidex update" into lmp-docs * commit '34e0f6401e66df33ec71df7f76196bbe0eca3183': docs: gradle multidex update
\| * \| \|	am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" ↵	Rich Slogar	2015-05-06	1	-8/+18
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into lmp-docs * commit '84a67c7db75edc192a8975637c99c9a917796ff1': docs: gradle multidex update
\| \| * \|	am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs	Rich Slogar	2015-05-06	1	-8/+18
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '1b5f692d853cf5e873dbe4eb93c34e3fcdbb02ed': docs: gradle multidex update
\| \| \| *	am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs	Rich Slogar	2015-05-06	1	-8/+18
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '9b4d57e1dc480f375dc26a77333ff4705f760bb8': docs: gradle multidex update
\| \| \| \| *	Merge "docs: gradle multidex update" into lmp-docs	Rich Slogar	2015-05-05	1	-8/+18
\| \| \| \| \|\
\| \| \| \| \| *	docs: gradle multidex update	Rich Slogar	2015-04-21	1	-8/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	b.andriod 103259 b.android 165146 Change-Id: If5107aa419b9eb097249141460d0dd8673dce240
* \| \| \| \| \|	am b462da9e: am f0ea8f9f: am f77d64dc: am 2f14c38f: Merge "docs: overview ↵	Rich Slogar	2015-05-06	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	link to release notes" into lmp-docs * commit 'b462da9e3d554deb9ba5b8ca58d5d66797fb54d5': docs: overview link to release notes
\| * \| \| \| \|	am f0ea8f9f: am f77d64dc: am 2f14c38f: Merge "docs: overview link to release ↵	Rich Slogar	2015-05-06	1	-1/+2
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	notes" into lmp-docs * commit 'f0ea8f9f1e1ede23f954cade5ee4a84e92d28943': docs: overview link to release notes
\| \| * \| \| \|	am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into ↵	Rich Slogar	2015-05-06	1	-1/+2
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	lmp-docs * commit 'f77d64dca71e9a11de3f234ce686692dae9d92ed': docs: overview link to release notes
\| \| \| * \| \|	am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs	Rich Slogar	2015-05-06	1	-1/+2
\| \| \| \|\ \ \ \| \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '2f14c38ffb5da66ab58551a1ccd273dfb602babf': docs: overview link to release notes
\| \| \| \| * \|	Merge "docs: overview link to release notes" into lmp-docs	Rich Slogar	2015-05-05	1	-1/+2
\| \| \| \| \|\ \
\| \| \| \| \| * \|	docs: overview link to release notes	Rich Slogar	2015-04-30	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	b/20719250 Change-Id: I34723beab3aa41aae51a27c2a23fdd91dd9b6bb5
* \| \| \| \| \| \|	am 48ea7762: am 7e33aa48: am 96d00bb6: am 37ca7773: Merge "docs: translation ↵	Rich Slogar	2015-05-06	1	-4/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	editor update" into lmp-docs * commit '48ea7762295cdf3e2bd61dafd55422a0d6bee5e6': docs: translation editor update
\| * \| \| \| \| \|	am 7e33aa48: am 96d00bb6: am 37ca7773: Merge "docs: translation editor ↵	Rich Slogar	2015-05-06	1	-4/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update" into lmp-docs * commit '7e33aa4843edbc037659023cff98dd44ac90d44c': docs: translation editor update
\| \| * \| \| \| \|	am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs	Rich Slogar	2015-05-06	1	-4/+1
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '96d00bb64c8dc9fb85f1f2ecb894930d3eacd0d5': docs: translation editor update
\| \| \| * \| \| \|	am 37ca7773: Merge "docs: translation editor update" into lmp-docs	Rich Slogar	2015-05-06	1	-4/+1
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '37ca7773a59cb4a7de4406378f5b1c8d4c5fefd2': docs: translation editor update
\| \| \| \| * \| \|	Merge "docs: translation editor update" into lmp-docs	Rich Slogar	2015-05-05	1	-4/+1
\| \| \| \| \|\ \ \
\| \| \| \| \| * \| \|	docs: translation editor update	Rich Slogar	2015-04-30	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I64e48bb69b8bfd908e6462536beafc4f238ecc63
* \| \| \| \| \| \| \|	am cc4a2980: am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory ↵	Rich Slogar	2015-05-06	2	-8/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	monitor duplicate paragraph" into lmp-docs * commit 'cc4a29807e679a1691a949c117f540867304acc7': docs: memory monitor duplicate paragraph
\| * \| \| \| \| \| \|	am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate ↵	Rich Slogar	2015-05-06	2	-8/+1
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	paragraph" into lmp-docs * commit 'ffef3b76762ae32c3a6fca00fa9cbdd1230f6f83': docs: memory monitor duplicate paragraph
\| \| * \| \| \| \| \|	am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" ↵	Rich Slogar	2015-05-06	2	-8/+1
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into lmp-docs * commit '39b51b4968c0aeeef84d5d75ef683516e658a30d': docs: memory monitor duplicate paragraph
\| \| \| * \| \| \| \|	am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs	Rich Slogar	2015-05-06	2	-8/+1
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '2febf6e0a5bd9f716005c256f7357c6f44b52c2b': docs: memory monitor duplicate paragraph
\| \| \| \| * \| \| \|	Merge "docs: memory monitor duplicate paragraph" into lmp-docs	Rich Slogar	2015-05-05	2	-8/+1
\| \| \| \| \|\ \ \ \
\| \| \| \| \| * \| \| \|	docs: memory monitor duplicate paragraph	Rich Slogar	2015-04-30	2	-8/+1
\| \| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I60d6a6da19beba6d3371da304c7ab35a017856f2
* \| \| \| \| \| \| \|	am e12c404a: am 35d7cd40: am d0551fee: Merge "docs: providing resources ↵	Rich Slogar	2015-05-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	link" into lmp-mr1-ub-docs * commit 'e12c404a07037d214c7f1f83d993ce9dba95e47b': docs: providing resources link
\| * \| \| \| \| \| \|	am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into ↵	Rich Slogar	2015-05-06	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	lmp-mr1-ub-docs * commit '35d7cd40bb167ee08bbb855195eb395e77a05b7a': docs: providing resources link
\| \| * \| \| \| \| \|	am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs	Rich Slogar	2015-05-06	1	-1/+1
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'd0551feed28614dad957a09998522b25392ce621': docs: providing resources link
\| \| \| * \| \| \| \|	Merge "docs: providing resources link" into lmp-mr1-ub-docs	Rich Slogar	2015-05-05	1	-1/+1
\| \| \| \|\ \ \ \ \
\| \| \| \| * \| \| \| \|	docs: providing resources link	Rich Slogar	2015-04-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	b/20453479 Change-Id: I62ed340a30efd1295d3e9a998a853b6cbfdbbd97
* \| \| \| \| \| \| \| \|	am 79f12bb6: am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript ↵	Jean-Luc Brouillet	2015-05-05	79	-19041/+25714
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reference documentation. * commit '79f12bb648aa8a4f71e2c64c5c6354e2261e3257': docs: Overhaul of the RenderScript reference documentation.
\| * \| \| \| \| \| \| \|	am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference ↵	Jean-Luc Brouillet	2015-05-05	79	-19041/+25714
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	documentation. * commit 'd967fcbee77b2872cb5ae6b05aaabbbc764f806b': docs: Overhaul of the RenderScript reference documentation.
\| \| * \| \| \| \| \| \|	am e9f17cda: docs: Overhaul of the RenderScript reference documentation.	Jean-Luc Brouillet	2015-05-05	79	-19041/+25714
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'e9f17cda80ae60818f43b4ed724436c8b88fd0db': docs: Overhaul of the RenderScript reference documentation.
\| \| \| * \| \| \| \| \|	docs: Overhaul of the RenderScript reference documentation.	Jean-Luc Brouillet	2015-05-05	79	-19041/+25714
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cherry-pick from CL: https://android-review.googlesource.com/148241 This CL replaces the Doxygen generated documentation by one that's created by our internal tool found in framework/rs/api. The big advantages: - Can handle overloaded functions. Doxygen could not and RenderScript has many. - Can have version information. - Can match the look of the Java documentation. - Cleaner look and no leaking of internal paths. This CL also include changes introduced by the L release which was missing previously. Change-Id: Icade41d04d35e45c445ad952bb8ce14389f9f59f
* \| \| \| \| \| \| \| \|	am 08c72b91: am ecfed34d: Merge "Doc change: merge landing page and ↵	Dirk Dougherty	2015-05-05	117	-1226/+1470
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	header/footer designs." into mnc-preview-docs * commit '08c72b91bedefbebe0547646544cd875c1062af0': Doc change: merge landing page and header/footer designs.