summaryrefslogtreecommitdiffstats
path: root/docs/html
Commit message (Collapse)AuthorAgeFilesLines
* am 0ae9e101: am e7672d00: am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 ↵Scott Main2009-10-291-4/+2
|\ | | | | | | | | | | | | | | | | into eclair-sdk Merge commit '0ae9e101a6cdf4e31cb130fd120fd5a05847e2d3' * commit '0ae9e101a6cdf4e31cb130fd120fd5a05847e2d3': docs: add 2.0 video to developer site feature videos
| * am e7672d00: am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdkScott Main2009-10-291-4/+2
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'e7672d0041f7d4093cac6db1233cd22b5cc45a01' into eclair-mr2-plus-aosp * commit 'e7672d0041f7d4093cac6db1233cd22b5cc45a01': docs: add 2.0 video to developer site feature videos
| | * Merge change Iacb6e122 into eclair-sdkAndroid (Google) Code Review2009-10-281-4/+2
| | |\ | | | | | | | | | | | | | | | | * changes: docs: add 2.0 video to developer site feature videos
| | | * docs: add 2.0 video to developer site feature videosScott Main2009-10-281-4/+2
| | | |
* | | | am 524c4e72: am 9ac642a9: am 340fbc36: am 5a4d6696: Merge change Ib80db923 ↵Dirk Dougherty2009-10-2911-65/+88
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eclair-sdk Merge commit '524c4e720d3811230ef9f1707efa280f8f00b851' * commit '524c4e720d3811230ef9f1707efa280f8f00b851': doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
| * | | am 9ac642a9: am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdkDirk Dougherty2009-10-2911-65/+88
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '9ac642a924a85d26fb093a0c4aa0a20817927935' into eclair-mr2-plus-aosp * commit '9ac642a924a85d26fb093a0c4aa0a20817927935': doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
| | * | Merge change Ib80db923 into eclair-sdkAndroid (Google) Code Review2009-10-2811-65/+88
| | |\ \ | | | | | | | | | | | | | | | | | | | | * changes: doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
| | | * | doc change: some fixes for online sdk docs. update "testing" section of ↵Dirk Dougherty2009-10-2711-65/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screens support doc. Bug: 2160782 Change-Id: Ib80db9231f91a36f503db487982378b252c0fcd8
* | | | | am cc9d066b: am 5c24774d: am 42522449: am 675eb31d: Merge change I1a010c12 ↵Scott Main2009-10-291-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eclair-sdk Merge commit 'cc9d066bf3d2bad6be5f628caa8b87158e56e246' * commit 'cc9d066bf3d2bad6be5f628caa8b87158e56e246': docs: fix broken link for download page.
| * | | | am 5c24774d: am 42522449: am 675eb31d: Merge change I1a010c12 into eclair-sdkScott Main2009-10-291-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5c24774de4a25797d8a4c3f4a25f2633939a1d1a' into eclair-mr2-plus-aosp * commit '5c24774de4a25797d8a4c3f4a25f2633939a1d1a': docs: fix broken link for download page.
| | * | | Merge change I1a010c12 into eclair-sdkAndroid (Google) Code Review2009-10-271-1/+1
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | * changes: docs: fix broken link for download page.
| | | * | docs: fix broken link for download page.Scott Main2009-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a script was inserting a path that is no longer needed. the removed class was the script identifier, so removing this class means the path won't be added.
* | | | | am a292fefe: am 4c071f0d: am 59625fa8: am 946f9d1e: Merge change I020b31e1 ↵Dirk Dougherty2009-10-2813-127/+318
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eclair-sdk Merge commit 'a292fefeb77ed8e33afd7451090c3e21761fd266' * commit 'a292fefeb77ed8e33afd7451090c3e21761fd266': doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
| * | | | am 4c071f0d: am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdkDirk Dougherty2009-10-2813-127/+318
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4c071f0d69ac0e3eaf386797faeb52d63de30806' into eclair-mr2-plus-aosp * commit '4c071f0d69ac0e3eaf386797faeb52d63de30806': doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
| | * | | Merge change I020b31e1 into eclair-sdkAndroid (Google) Code Review2009-10-2613-127/+318
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | * changes: doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
| | | * | doc change: add SDK sizes, checksums, small changes for online SDK doc set, ↵Dirk Dougherty2009-10-2613-127/+318
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | add layoutopt doc. Bug:2160782 Change-Id: I020b31e10f2733223aa37d03687cf8a63843afa7
* | | | am aaeafec5: am 66e69251: am 91bfbfb9: am 08c57535: docs: add 2.0 highlights ↵Scott Main2009-10-289-32/+234
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc and updated homepage Merge commit 'aaeafec5cd27c9bcccd21228be1bb8cfb9615138' * commit 'aaeafec5cd27c9bcccd21228be1bb8cfb9615138': docs: add 2.0 highlights doc and updated homepage
| * | | am 66e69251: am 91bfbfb9: am 08c57535: docs: add 2.0 highlights doc and ↵Scott Main2009-10-289-32/+234
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated homepage Merge commit '66e6925154a64d4fab53e6241e9e1fd227f42352' into eclair-mr2-plus-aosp * commit '66e6925154a64d4fab53e6241e9e1fd227f42352': docs: add 2.0 highlights doc and updated homepage
| | * | docs: add 2.0 highlights doc and updated homepageScott Main2009-10-269-32/+234
| | |/
* | | am 838bb989: am 53976509: am 37ebfad1: am a250f0c8: doc change: fix broken ↵Dirk Dougherty2009-10-281-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | link at top of installing doc Merge commit '838bb9893182b1be5a64226f0a6fd7e953815ec6' * commit '838bb9893182b1be5a64226f0a6fd7e953815ec6': doc change: fix broken link at top of installing doc
| * | am 53976509: am 37ebfad1: am a250f0c8: doc change: fix broken link at top of ↵Dirk Dougherty2009-10-281-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | installing doc Merge commit '53976509639b136150a844ff92544f96cf048943' into eclair-mr2-plus-aosp * commit '53976509639b136150a844ff92544f96cf048943': doc change: fix broken link at top of installing doc
| | * doc change: fix broken link at top of installing docDirk Dougherty2009-10-221-1/+1
| | | | | | | | | | | | Bug: 2160782
* | | doc change: fix build from bad merge. Add missing @jd:bodyDirk Dougherty2009-10-261-3/+1
| | | | | | | | | | | | Change-Id:Idbdeed6bce2a247188e0bfb79e0a0cdbcc44bb85
* | | am 3bf0210d: am f0d9c000: am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 ↵Dirk Dougherty2009-10-2211-134/+113
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into eclair-sdk Merge commit '3bf0210dca67e534bf8d344575abf32e653c8407' * commit '3bf0210dca67e534bf8d344575abf32e653c8407': doc change: incorporate comments on SDK docs and structure.
| * | am f0d9c000: am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 into eclair-sdkDirk Dougherty2009-10-2211-134/+113
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'f0d9c0000858f3e48bcd1efec75f2dff1cbc6ed5' into eclair-mr2-plus-aosp * commit 'f0d9c0000858f3e48bcd1efec75f2dff1cbc6ed5': doc change: incorporate comments on SDK docs and structure.
| | * doc change: incorporate comments on SDK docs and structure.Dirk Dougherty2009-10-2211-134/+113
| | | | | | | | | | | | Bug: 2160782
* | | Merge commit '9b7fb57c' into manualmergeDirk Dougherty2009-10-2224-742/+1499
|\ \ \ | |/ / | | | | | | | | | Conflicts: docs/html/sdk/android-1.5.jd
| * | am 96f225af: am 4f82394a: am ee58d1bf: doc change: Add docs for SDK. Support ↵Dirk Dougherty2009-10-2224-743/+1498
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent. Merge commit '96f225afad61ee701dd84348e380a40ff8900fc0' into eclair-mr2-plus-aosp * commit '96f225afad61ee701dd84348e380a40ff8900fc0': doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
| | * doc change: Add docs for SDK. Support new modular structure. In Android.mk, ↵Dirk Dougherty2009-10-2224-743/+1498
| | | | | | | | | | | | | | | | | | | | | change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent. Change-Id:I368345755dd753b1056fb06ff25e4b32f3020e4d Bug:2160782
* | | am 71d4da49: am 207fadf6: am f41eb87d: am 6797b9fa: doc change: add diff ↵Dirk Dougherty2009-10-22197-0/+52262
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | report 4 -> 5 Merge commit '71d4da499a7cea2bb3bd3a6c1ed9e8e2b6b34ba8' * commit '71d4da499a7cea2bb3bd3a6c1ed9e8e2b6b34ba8': doc change: add diff report 4 -> 5
| * | am 207fadf6: am f41eb87d: am 6797b9fa: doc change: add diff report 4 -> 5Dirk Dougherty2009-10-22197-0/+52262
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '207fadf6e7e99004ecfa4831e71ebcac9ecaa693' into eclair-mr2-plus-aosp * commit '207fadf6e7e99004ecfa4831e71ebcac9ecaa693': doc change: add diff report 4 -> 5
| | * doc change: add diff report 4 -> 5Dirk Dougherty2009-10-21197-0/+52262
| | | | | | | | | | | | Bug: 2160782
* | | am 419264c2: am 875d235c: am e12191a7: am 439bf97c: doc change: edits to the ↵Dirk Dougherty2009-10-221-270/+748
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | screens support doc. Merge commit '419264c22c8776274119e66349068f8c712b1c2f' * commit '419264c22c8776274119e66349068f8c712b1c2f': doc change: edits to the screens support doc.
| * | am 875d235c: am e12191a7: am 439bf97c: doc change: edits to the screens ↵Dirk Dougherty2009-10-221-270/+748
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | support doc. Merge commit '875d235cf1c685597026997bae49ea820351b576' into eclair-mr2-plus-aosp * commit '875d235cf1c685597026997bae49ea820351b576': doc change: edits to the screens support doc.
| | * doc change: edits to the screens support doc.Dirk Dougherty2009-10-211-270/+748
| | | | | | | | | | | | Bug: 2160782
* | | am f80cd7bd: am 208e390a: am e5e2c167: am f4b5540b: doc change only: add ↵Dirk Dougherty2009-10-2213-34/+837
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | screens support doc Merge commit 'f80cd7bdc4e6c1c83afb19650e9177ec5e0d8d6f' * commit 'f80cd7bdc4e6c1c83afb19650e9177ec5e0d8d6f': doc change only: add screens support doc
| * | am 208e390a: am e5e2c167: am f4b5540b: doc change only: add screens support docDirk Dougherty2009-10-2213-34/+837
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '208e390af0ab1ca5f0cb2000692ea20cf67a9ea3' into eclair-mr2-plus-aosp * commit '208e390af0ab1ca5f0cb2000692ea20cf67a9ea3': doc change only: add screens support doc
| | * doc change only: add screens support docDirk Dougherty2009-10-2113-34/+837
| | |
* | | resolved conflicts for merge of 618ae454 to masterScott Main2009-10-222-3/+3
|\ \ \ | |/ /
| * | am df3a7e79: am 3c0c0da9: am f90178d0: docs only. fix some typos.Scott Main2009-10-222-5/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'df3a7e797738587873f1269b2989c516ec302395' into eclair-mr2-plus-aosp * commit 'df3a7e797738587873f1269b2989c516ec302395': docs only.
| | * docs only.Scott Main2009-10-212-5/+5
| | | | | | | | | | | | fix some typos.
* | | am 4d53dd40: am d7b1d3d4: am 9aa7e4e7: am d7bc6546: Fix spacing to escape ↵Jeff Sharkey2009-10-221-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | "false" correctly. Merge commit '4d53dd40ea5e433da419d0bddb0269a7acb2c268' * commit '4d53dd40ea5e433da419d0bddb0269a7acb2c268': Fix spacing to escape "false" correctly.
| * | am d7b1d3d4: am 9aa7e4e7: am d7bc6546: Fix spacing to escape "false" correctly.Jeff Sharkey2009-10-221-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'd7b1d3d4b4ff49a4b0872f8e39c71d8867527d63' into eclair-mr2-plus-aosp * commit 'd7b1d3d4b4ff49a4b0872f8e39c71d8867527d63': Fix spacing to escape "false" correctly.
| | * Fix spacing to escape "false" correctly.Jeff Sharkey2009-10-201-1/+1
| | |
| | * docs: fix doc error in dialog example snippet (no not merge)Scott Main2009-10-161-1/+1
| | | | | | | | | | | | bug: 2160782
* | | am 0712f24d: am a486f554: am 7f66dbce: Merge change Ic37381fb into eclairScott Main2009-10-161-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '0712f24dbf14473cb55e5b609c3418610b77d406' * commit '0712f24dbf14473cb55e5b609c3418610b77d406': docs: fix doc error in dialog example snippet
| * | am a486f554: am 7f66dbce: Merge change Ic37381fb into eclairScott Main2009-10-161-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a486f554aa494dfeea4d63fde0d533ea9e1cfe2f' into eclair-mr2-plus-aosp * commit 'a486f554aa494dfeea4d63fde0d533ea9e1cfe2f': docs: fix doc error in dialog example snippet
| | * | docs: fix doc error in dialog example snippetScott Main2009-10-161-1/+1
| | |/ | | | | | | | | | bug: 2160782
* | | am d5f5a009: am f18b9311: am 30a6657e: Merge change Ic9b31801 into eclairScott Main2009-10-148-141/+759
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd5f5a0094559853b171ea97702e2d0477692226d' * commit 'd5f5a0094559853b171ea97702e2d0477692226d': docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0...
| * | am f18b9311: am 30a6657e: Merge change Ic9b31801 into eclairScott Main2009-10-148-141/+759
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'f18b9311e8a6c4b05574727ae117338a9c341a1b' into eclair-mr2-plus-aosp * commit 'f18b9311e8a6c4b05574727ae117338a9c341a1b': docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0...