165 Commits

Author	SHA1	Message	Date
Scott Main	952e39578d	Merge commit '2f7b69aa' into manualmerge ... Conflicts: docs/html/guide/topics/ui/themes.jd	2010-02-03 16:37:03 -08:00
Scott Main	2f7b69aab9	am 98a9fc0a: Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair ... Merge commit '98a9fc0a0025a3df7b36f7752fc330eba8810603' into eclair-plus-aosp * commit '98a9fc0a0025a3df7b36f7752fc330eba8810603': docs: revise the Style and Themes document to improve the	2010-02-03 16:18:17 -08:00
Scott Main	4d5770904c	docs: revise the Style and Themes document to improve the ... clarity of the concepts and expand the available information	2010-02-03 14:50:15 -08:00
Dirk Dougherty	1f40f174e7	am b574cf87: am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair ... Merge commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a' * commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a': SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.	2010-01-28 16:52:43 -08:00
Dirk Dougherty	b574cf876e	am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair ... Merge commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp * commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e': SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.	2010-01-28 16:46:54 -08:00
Dirk Dougherty	95b528eab5	SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features. ... Bug: 2160782 Change-Id: I8560f32b04a4044f58b8f7dd678aec781d56b9d9	2010-01-28 16:26:50 -08:00
Dirk Dougherty	88098683b0	am 6b113b1a: am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair ... Merge commit '6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9' * commit '6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9': SDK doc change: Miscellaneous fixes.	2010-01-11 13:50:42 -08:00
Dirk Dougherty	6b113b1a82	am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair ... Merge commit '595f48b2a4fa2751ad638b60d2476e77738b21da' into eclair-plus-aosp * commit '595f48b2a4fa2751ad638b60d2476e77738b21da': SDK doc change: Miscellaneous fixes.	2010-01-11 11:38:04 -08:00
Dirk Dougherty	cf6bbab6db	SDK doc change: Miscellaneous fixes. ... Bug: 2160782 Change-Id: I5f1e449bcb2c8f715858b6819f041349088a8a32	2010-01-11 11:15:22 -08:00
Dirk Dougherty	1c819a5e3e	am 5f6002ec: am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair ... Merge commit '5f6002ec5f52ed164b591cf4b267fe771a81731f' * commit '5f6002ec5f52ed164b591cf4b267fe771a81731f': SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.	2010-01-07 12:37:15 -08:00
Dirk Dougherty	5f6002ec5f	am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair ... Merge commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5' into eclair-plus-aosp * commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5': SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.	2010-01-07 12:33:48 -08:00
Dirk Dougherty	4e7db25687	SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files. ... Bug: 2160782 Change-Id: I537194ecddc53d4f0e8456ce958ae8db6f521593	2010-01-07 12:05:01 -08:00
Scott Main	0f10c2bd32	am 5508987b: am e4c2a376: Merge change I2703edac into eclair ... Merge commit '5508987bfcdd9a441966893ee21c6cf7803c0b49' * commit '5508987bfcdd9a441966893ee21c6cf7803c0b49': docs: add new device features for the uses-feature	2009-12-19 12:36:05 -08:00
Scott Main	5508987bfc	am e4c2a376: Merge change I2703edac into eclair ... Merge commit 'e4c2a37624612c9708d0767f8643a10502e6887a' into eclair-plus-aosp * commit 'e4c2a37624612c9708d0767f8643a10502e6887a': docs: add new device features for the uses-feature	2009-12-19 12:33:00 -08:00
Scott Main	2703edac00	docs: add new device features for the uses-feature ... manifest element and edit some other pieces.	2009-12-19 00:55:18 -08:00
Scott Main	9256bb08d2	am 9a6c8168: am 77fa05a4: Merge change Iab5952e1 into eclair ... Merge commit '9a6c8168f743c1dc8cc28de22fe12be4623434cd' * commit '9a6c8168f743c1dc8cc28de22fe12be4623434cd': docs: add "required" attribute to the <uses-feature> docs	2009-12-19 00:41:10 -08:00
Scott Main	9a6c8168f7	am 77fa05a4: Merge change Iab5952e1 into eclair ... Merge commit '77fa05a43d3f3f967311d6806fe743017950cf92' into eclair-plus-aosp * commit '77fa05a43d3f3f967311d6806fe743017950cf92': docs: add "required" attribute to the <uses-feature> docs	2009-12-19 00:39:26 -08:00
Scott Main	0b91635caf	docs: add "required" attribute to the <uses-feature> docs ... and add a note to the CAMERA permission stating that it enables the <uses-feature> for camera. This is an incrimental update for the 2.0.1 docs. More changes to come for the 2.1 docs to include more features	2009-12-19 00:25:11 -08:00
Scott Main	3a9b03425b	am a2bca747: am a25032a0: Merge change Ic31c0f62 into eclair ... Merge commit 'a2bca7477d803541c5a48cc7624e2b6c305c5970' * commit 'a2bca7477d803541c5a48cc7624e2b6c305c5970': docs: update the Bluetooth guide with links to the sample	2009-12-18 17:18:54 -08:00
Scott Main	a2bca7477d	am a25032a0: Merge change Ic31c0f62 into eclair ... Merge commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad' into eclair-plus-aosp * commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad': docs: update the Bluetooth guide with links to the sample	2009-12-18 17:15:38 -08:00
Scott Main	1362bbcf76	docs: update the Bluetooth guide with links to the sample ... app, scrub the sibling files, and revise the Bluetooth package summary to point to the BT dev guide.	2009-12-16 18:48:02 -08:00
Scott Main	18a2788695	am 8bda0fb0: Merge change Iccb92649 into eclair ... Merge commit '8bda0fb0ca24875ad6084f35250f166b45f967a1' into eclair-plus-aosp * commit '8bda0fb0ca24875ad6084f35250f166b45f967a1': docs: fix typo	2009-12-16 11:18:00 -08:00
Scott Main	ccb926498f	docs: fix typo	2009-12-16 11:13:40 -08:00
Scott Main	c49f864695	resolved conflicts for merge of aaf8a9d8 to master	2009-12-16 11:08:26 -08:00
Dirk Dougherty	c0d7e1ccda	am 4a2d630f: am 6ccc515c: Merge change I8385f59d into eclair ... Merge commit '4a2d630f686c44fb2a77c90bc6cf87779725abe2' * commit '4a2d630f686c44fb2a77c90bc6cf87779725abe2': sdk doc change for esr: Cleanup for resources tab content.	2009-12-16 10:32:20 -08:00
Scott Main	aaf8a9d885	am 218c0763: Merge change Ib43ec8f6 into eclair ... Merge commit '218c0763d5122ed975af7b9bd67e22def6364a23' into eclair-plus-aosp * commit '218c0763d5122ed975af7b9bd67e22def6364a23': docs: fix some typos in the manifest docs samples and	2009-12-16 10:28:11 -08:00
Dirk Dougherty	4a2d630f68	am 6ccc515c: Merge change I8385f59d into eclair ... Merge commit '6ccc515c7f705a66718d0138a421e29186667b9e' into eclair-plus-aosp * commit '6ccc515c7f705a66718d0138a421e29186667b9e': sdk doc change for esr: Cleanup for resources tab content.	2009-12-16 10:27:47 -08:00
Android (Google) Code Review	218c0763d5	Merge change Ib43ec8f6 into eclair ... * changes: docs: fix some typos in the manifest docs samples and remove the "one or more of" phrase from the syntax snippet because it interferes with the syntax coloring.	2009-12-16 10:05:10 -08:00
Dirk Dougherty	50bfb39c55	sdk doc change for esr: Cleanup for resources tab content. ... Bug:2160782 Change-Id: I8385f59d764156ccc318f71e5d344c7f33330c40	2009-12-15 19:24:58 -08:00
Dirk Dougherty	692bf86e67	am 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair ... Merge commit '479a49f74f77855825ba69b105c065422c24246a' * commit '479a49f74f77855825ba69b105c065422c24246a': sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.	2009-12-15 15:04:00 -08:00
Dirk Dougherty	479a49f74f	am 7585586c: Merge change Ib1eb2e9e into eclair ... Merge commit '7585586ce5b5de699b95125672e29eaf70876727' into eclair-plus-aosp * commit '7585586ce5b5de699b95125672e29eaf70876727': sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.	2009-12-15 07:40:02 -08:00
Scott Main	b43ec8f631	docs: fix some typos in the manifest docs samples and ... remove the "one or more of" phrase from the syntax snippet because it interferes with the syntax coloring.	2009-12-14 14:37:53 -08:00
Dirk Dougherty	22558d0be8	sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes. ... Bug: 2160782 Change-Id: Ib1eb2e9e3fe3a7b2ad16387dbf888646a1195221	2009-12-14 11:40:02 -08:00
Scott Main	514ef96827	am 94065a29: am f210f048: am 88ff62db: Merge change I06398298 into eclair ... Merge commit '94065a29c1c68ecf6aa0979a4c91f2616227f264' * commit '94065a29c1c68ecf6aa0979a4c91f2616227f264': docs: add images used in BT developer guide.	2009-12-10 23:45:48 -08:00
Scott Main	f1ec19e0f3	am 4570dfa2: am 7b0463a9: am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs ... Merge commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d' * commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d': docs: add the Bluetooth developer guide,	2009-12-10 23:43:12 -08:00
Scott Main	94065a29c1	am f210f048: am 88ff62db: Merge change I06398298 into eclair ... Merge commit 'f210f048f754e5c39c192ecdbadd3aeac26471ed' into eclair-mr2-plus-aosp * commit 'f210f048f754e5c39c192ecdbadd3aeac26471ed': docs: add images used in BT developer guide.	2009-12-10 18:07:53 -08:00
Scott Main	4570dfa201	am 7b0463a9: am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs ... Merge commit '7b0463a949b57620680b95e45c66a05f67426b74' into eclair-mr2-plus-aosp * commit '7b0463a949b57620680b95e45c66a05f67426b74': docs: add the Bluetooth developer guide,	2009-12-10 17:53:27 -08:00
Scott Main	fbdd809d84	am 88ff62db: Merge change I06398298 into eclair ... Merge commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1' into eclair-plus-aosp * commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1': docs: add images used in BT developer guide.	2009-12-09 18:25:37 -08:00
Scott Main	fe7f27aabf	docs: add images used in BT developer guide. ... needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b	2009-12-09 18:16:02 -08:00
Scott Main	0ee7706c59	am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs ... Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-plus-aosp * commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379': docs: add the Bluetooth developer guide,	2009-12-09 18:06:58 -08:00
Scott Main	ed2a70d649	docs: add the Bluetooth developer guide, ... and make some revisions to the BT javadocs	2009-12-09 17:59:38 -08:00
Scott Main	6b661d28a0	am ea01f514: am 7f1ab539: am 90d311ff: Merge change I33e0f00e into eclair ... Merge commit 'ea01f514e161a2310fd21d8aef8a4b3aaca4ac7b' * commit 'ea01f514e161a2310fd21d8aef8a4b3aaca4ac7b': docs: fix markup error in xml sample	2009-12-04 04:26:33 -08:00
Scott Main	ea01f514e1	am 7f1ab539: am 90d311ff: Merge change I33e0f00e into eclair ... Merge commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b' into eclair-mr2-plus-aosp * commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b': docs: fix markup error in xml sample	2009-12-03 16:35:39 -08:00
Scott Main	0fed723ba4	am 90d311ff: Merge change I33e0f00e into eclair ... Merge commit '90d311ff33f33024f642ef03a02fb62566c9f46b' into eclair-plus-aosp * commit '90d311ff33f33024f642ef03a02fb62566c9f46b': docs: fix markup error in xml sample	2009-12-03 11:54:36 -08:00
Scott Main	33e0f00e95	docs: fix markup error in xml sample	2009-12-03 11:33:25 -08:00
Dirk Dougherty	0f29956e43	am fe4e74b6: am 233c50e4: am 43810507: Merge change Ic8231560 into eclair ... Merge commit 'fe4e74b62de9348b6bf3322735e7fba090e3dd72' * commit 'fe4e74b62de9348b6bf3322735e7fba090e3dd72': sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.	2009-12-02 20:28:55 -08:00
Dirk Dougherty	fe4e74b62d	am 233c50e4: am 43810507: Merge change Ic8231560 into eclair ... Merge commit '233c50e4aa6de6f77b90c5c65f956f9f4251b5a9' into eclair-mr2-plus-aosp * commit '233c50e4aa6de6f77b90c5c65f956f9f4251b5a9': sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.	2009-12-02 09:57:17 -08:00
Dirk Dougherty	f37314c2be	am 43810507: Merge change Ic8231560 into eclair ... Merge commit '43810507b75cd492e8177ee082e688f87f0ab49c' into eclair-plus-aosp * commit '43810507b75cd492e8177ee082e688f87f0ab49c': sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.	2009-12-01 22:46:30 -08:00
Dirk Dougherty	7500f341dd	sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes. ... Bug: 2160782 Change-Id: Ic8231560ef1bc036cfd5d242c65f654cb110fc6b	2009-12-01 19:27:26 -08:00
Dirk Dougherty	b7e7b71065	am a292fefe: am 4c071f0d: am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk ... Merge commit 'a292fefeb77ed8e33afd7451090c3e21761fd266' * commit 'a292fefeb77ed8e33afd7451090c3e21761fd266': doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.	2009-10-28 23:54:35 -07:00