summaryrefslogtreecommitdiffstats
path: root/docs/html
Commit message (Collapse)AuthorAgeFilesLines
...
* | | am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the ↵Trevor Johns2010-01-114-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Resources TOC on developer.android.com." into eclair Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp * commit '50a3977c619be113bb35fb7fd53874effad6dbe4': Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
| * | Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on ↵Trevor Johns2010-01-114-0/+9
| |\ \ | | | | | | | | | | | | developer.android.com." into eclair
| | * | Adding BusinessCard sample to Android.mk and to the Resources TOC on ↵Trevor Johns2010-01-114-0/+9
| | | | | | | | | | | | | | | | developer.android.com.
* | | | am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclairDirk Dougherty2010-01-115-9/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '595f48b2a4fa2751ad638b60d2476e77738b21da' into eclair-plus-aosp * commit '595f48b2a4fa2751ad638b60d2476e77738b21da': SDK doc change: Miscellaneous fixes.
| * | | Merge "SDK doc change: Miscellaneous fixes." into eclairDirk Dougherty2010-01-115-9/+9
| |\ \ \ | | |/ / | |/| |
| | * | SDK doc change: Miscellaneous fixes.Dirk Dougherty2010-01-115-9/+9
| | |/ | | | | | | | | | | | | Bug: 2160782 Change-Id: I5f1e449bcb2c8f715858b6819f041349088a8a32
* | | am 063d03ed: Converting tabs to spaces in docs/html/resources/resources_toc.cs.Trevor Johns2010-01-071-96/+96
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '063d03ed0882582840c7db610635aa89c1a01eec' into eclair-plus-aosp * commit '063d03ed0882582840c7db610635aa89c1a01eec': Converting tabs to spaces in docs/html/resources/resources_toc.cs.
| * | Converting tabs to spaces in docs/html/resources/resources_toc.cs.Trevor Johns2010-01-071-96/+96
| |/
* | am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to ↵Dirk Dougherty2010-01-076-17/+188
|\ \ | |/ | | | | | | | | | | | | | | 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.
| * Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best ↵Dirk Dougherty2010-01-076-17/+188
| |\ | | | | | | | | | practices. Clean up blockquote usage in other files." into eclair
| | * SDK doc change: add "Optimizing Judiciously" excerpt to best practices. ↵Dirk Dougherty2010-01-076-17/+188
| | | | | | | | | | | | | | | | | | | | | Clean up blockquote usage in other files. Bug: 2160782 Change-Id: I537194ecddc53d4f0e8456ce958ae8db6f521593
* | | am d8858893: Merge "docs: fix some broken links" into eclairScott Main2010-01-072-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd88588935e3a09b4b13753d55dbe8a8e9ed240a1' into eclair-plus-aosp * commit 'd88588935e3a09b4b13753d55dbe8a8e9ed240a1': docs: fix some broken links
| * | Merge "docs: fix some broken links" into eclairScott Main2010-01-072-3/+3
| |\ \
| | * | docs: fix some broken linksScott Main2009-12-212-3/+3
| | | |
* | | | am c20467f9: docs: update the device dashboardScott Main2010-01-051-7/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'c20467f94afd2ac173dcb1d27f2a8fb91816edb0' into eclair-plus-aosp * commit 'c20467f94afd2ac173dcb1d27f2a8fb91816edb0': docs: update the device dashboard
| * | | docs: update the device dashboardScott Main2010-01-051-7/+9
| | |/ | |/|
* | | am 74962e56: upload new dev site robots.txt to disallow old tutorial and ↵Scott Main2009-12-212-2352/+3235
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | samples directories (while old pages are still orphaned) and upload new sitemap including new resources pages. Merge commit '74962e56c5d625fe94a6bfc9cf1acd361382f0b6' into eclair-plus-aosp * commit '74962e56c5d625fe94a6bfc9cf1acd361382f0b6': upload new dev site robots.txt to disallow old tutorial and
| * | upload new dev site robots.txt to disallow old tutorial andScott Main2009-12-212-2352/+3235
| |/ | | | | | | | | samples directories (while old pages are still orphaned) and upload new sitemap including new resources pages.
* | am e4c2a376: Merge change I2703edac into eclairScott Main2009-12-191-22/+66
|\ \ | |/ | | | | | | | | | | Merge commit 'e4c2a37624612c9708d0767f8643a10502e6887a' into eclair-plus-aosp * commit 'e4c2a37624612c9708d0767f8643a10502e6887a': docs: add new device features for the uses-feature
| * Merge change I2703edac into eclairAndroid (Google) Code Review2009-12-191-22/+66
| |\ | | | | | | | | | | | | * changes: docs: add new device features for the uses-feature manifest element and edit some other pieces.
| | * docs: add new device features for the uses-featureScott Main2009-12-191-22/+66
| | | | | | | | | | | | manifest element and edit some other pieces.
* | | am 77fa05a4: Merge change Iab5952e1 into eclairScott Main2009-12-191-35/+56
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '77fa05a43d3f3f967311d6806fe743017950cf92' into eclair-plus-aosp * commit '77fa05a43d3f3f967311d6806fe743017950cf92': docs: add "required" attribute to the <uses-feature> docs
| * | Merge change Iab5952e1 into eclairAndroid (Google) Code Review2009-12-191-35/+56
| |\ \ | | |/ | | | | | | | | | * changes: 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
| | * docs: add "required" attribute to the <uses-feature> docsScott Main2009-12-191-35/+56
| | | | | | | | | | | | | | | | | | | | | 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
* | | am 4d5a0645: doc change: add 7 diffs report.Dirk Dougherty2009-12-1964-0/+10276
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '4d5a0645535edd6c15e834df8ab9519652d71038' into eclair-plus-aosp * commit '4d5a0645535edd6c15e834df8ab9519652d71038': doc change: add 7 diffs report.
| * | doc change: add 7 diffs report.Dirk Dougherty2009-12-1864-0/+10276
| | | | | | | | | | | | | | | Bug: 2160782 Change-Id: Ic8444f43d21ffa0b6d7f679f80f86db88a95d189
* | | am 673b9378: Merge change Ie4b0d302 into eclairScott Main2009-12-181-12/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '673b937889d550700d9d4a80aefeedd5ebf3ecb4' into eclair-plus-aosp * commit '673b937889d550700d9d4a80aefeedd5ebf3ecb4': docs: update the site homepage with 2.1 announcement
| * | Merge change Ie4b0d302 into eclairAndroid (Google) Code Review2009-12-181-12/+12
| |\ \ | | | | | | | | | | | | | | | | * changes: docs: update the site homepage with 2.1 announcement
| | * | docs: update the site homepage with 2.1 announcementScott Main2009-12-161-12/+12
| | | |
* | | | am a25032a0: Merge change Ic31c0f62 into eclairScott Main2009-12-183-6/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad' into eclair-plus-aosp * commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad': docs: update the Bluetooth guide with links to the sample
| * | | Merge change Ic31c0f62 into eclairAndroid (Google) Code Review2009-12-183-6/+19
| |\ \ \ | | | |/ | | |/| | | | | | | | | * changes: 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.
| | * | docs: update the Bluetooth guide with links to the sampleScott Main2009-12-163-6/+19
| | | | | | | | | | | | | | | | | | | | app, scrub the sibling files, and revise the Bluetooth package summary to point to the BT dev guide.
* | | | am 5da76ddd: doc change: Add ?details query to doc about Android Market.Dirk Dougherty2009-12-171-25/+92
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '5da76ddd575b22d45bbea0155f62c7c32e1a510e' into eclair-plus-aosp * commit '5da76ddd575b22d45bbea0155f62c7c32e1a510e': doc change: Add ?details query to doc about Android Market.
| * | | doc change: Add ?details query to doc about Android Market.Dirk Dougherty2009-12-171-25/+92
| | | | | | | | | | | | | | | | | | | | Bug: 2160782 Change-Id: I86d1339e5bc5a36dbd033a7938764818a27b4d81
* | | | am 24780ea6: Merge change I75bb4c98 into eclairDirk Dougherty2009-12-171-0/+74
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '24780ea60fab2c7fb399c88cd51151eccbbf383f' into eclair-plus-aosp * commit '24780ea60fab2c7fb399c88cd51151eccbbf383f': doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.
| * | | Merge change I75bb4c98 into eclairAndroid (Google) Code Review2009-12-171-0/+74
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.
| | * | | doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.Dirk Dougherty2009-12-171-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2315781 Change-Id: I75bb4c98fa48af47c935787a5ab30ca7c1a8091d
* | | | | am 82e037a4: Merge change I3f67758f into eclairDirk Dougherty2009-12-171-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '82e037a4ed8ef38a4ca45e0058cf179111f1e98f' into eclair-plus-aosp * commit '82e037a4ed8ef38a4ca45e0058cf179111f1e98f': doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
| * | | | Merge change I3f67758f into eclairAndroid (Google) Code Review2009-12-171-0/+0
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * changes: doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
| | * | | doc change: remove existing (unchanged since sdk) samples from zip. This now ↵Dirk Dougherty2009-12-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contains only new samples. Bug:2160782 Change-Id: I3f67758f207df0fdde8a46d40ba8d5873097e460
* | | | | am 26099cd9: Merge change I7d67e1b3 into eclairScott Main2009-12-162-8/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '26099cd9ce44ef26ab3c9b342ec1a305c61b7a7c' into eclair-plus-aosp * commit '26099cd9ce44ef26ab3c9b342ec1a305c61b7a7c': docs: small edits
| * | | | Merge change I7d67e1b3 into eclairAndroid (Google) Code Review2009-12-162-8/+6
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | * changes: docs: small edits
| | * | docs: small editsScott Main2009-12-162-8/+6
| | |/
* | | am b2aab504: Merge change I354261e2 into eclairScott Main2009-12-161-2/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7' into eclair-plus-aosp * commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7': docs: small edit to live wallpaper sentence
| * | Merge change I354261e2 into eclairAndroid (Google) Code Review2009-12-161-2/+1
| |\ \ | | | | | | | | | | | | | | | | * changes: docs: small edit to live wallpaper sentence
| | * | docs: small edit to live wallpaper sentenceScott Main2009-12-161-2/+1
| | |/
* | | am 5ff60dff: Updating ↵Trevor Johns2009-12-161-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678. Merge commit '5ff60dff181fc4982c822ef97e14a293af66a246' into eclair-plus-aosp * commit '5ff60dff181fc4982c822ef97e14a293af66a246': Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
| * | Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect ↵Trevor Johns2009-12-161-0/+0
| |/ | | | | | | current state of sample code as of 1d151678.
* | am 8bda0fb0: Merge change Iccb92649 into eclairScott Main2009-12-161-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '8bda0fb0ca24875ad6084f35250f166b45f967a1' into eclair-plus-aosp * commit '8bda0fb0ca24875ad6084f35250f166b45f967a1': docs: fix typo
| * Merge change Iccb92649 into eclairAndroid (Google) Code Review2009-12-161-1/+1
| |\ | | | | | | | | | | | | * changes: docs: fix typo