Scott Main
eefe297249
am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdk
...
Merge commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b' into eclair-plus-aosp
* commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b':
docs: add new document for the win usb driver;
2009-11-06 15:48:20 -08:00
Scott Main
ad68fdd702
docs: add new document for the win usb driver;
...
remove usb guide from the device document.
2009-11-06 13:48:21 -08:00
Scott Main
8d86952068
docs: misc edits to samples page and intro docs
...
make samples page accessible from offline version instead
of redirecting to the user filesystem and include instructions
for creating projects based on the sample apps.
fix a link and add some content to the What is android doc.
bug: 2160782
2009-11-05 16:33:30 -08:00
Dirk Dougherty
3bb6baa349
am 759ac9e3: am 21cbd52b: am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
...
Merge commit '759ac9e3da0323177cd4ce1f85c04252086b6ea4'
* commit '759ac9e3da0323177cd4ce1f85c04252086b6ea4':
doc change: misc doc fixes.
2009-11-03 00:09:57 -08:00
Dirk Dougherty
759ac9e3da
am 21cbd52b: am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
...
Merge commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e' into eclair-mr2-plus-aosp
* commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e':
doc change: misc doc fixes.
2009-11-02 18:29:52 -08:00
Dirk Dougherty
f93cf36964
am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
...
Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-plus-aosp
* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
doc change: misc doc fixes.
2009-11-02 18:27:55 -08:00
Android (Google) Code Review
671c61d66f
Merge change Iaf5d2cc2 into eclair-sdk
...
* changes:
doc change: misc doc fixes.
2009-11-02 21:05:30 -05:00
Dirk Dougherty
6b13bc043e
doc change: misc doc fixes.
...
Bug:2160782
Change-Id: Iaf5d2cc2e3c657700469e8b7394a95bc03fc26f3
2009-10-30 19:44:22 -07:00
Scott Main
17629500fc
am fe48ca56: am 56725939: am 5eb80efb: am 3534dadd: docs: fix XSS vulnerability in search
...
Merge commit 'fe48ca568007428d7dd21a1837115a5f9d470f8b'
* commit 'fe48ca568007428d7dd21a1837115a5f9d470f8b':
docs: fix XSS vulnerability in search
2009-10-29 20:15:46 -07:00
Scott Main
fe48ca5680
am 56725939: am 5eb80efb: am 3534dadd: docs: fix XSS vulnerability in search
...
Merge commit '56725939b117f7ee71e7fdaf1c8bf865d9e377ab' into eclair-mr2-plus-aosp
* commit '56725939b117f7ee71e7fdaf1c8bf865d9e377ab':
docs: fix XSS vulnerability in search
2009-10-29 19:56:02 -07:00
Scott Main
5d0b809178
am 0ae9e101: am e7672d00: am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdk
...
Merge commit '0ae9e101a6cdf4e31cb130fd120fd5a05847e2d3'
* commit '0ae9e101a6cdf4e31cb130fd120fd5a05847e2d3':
docs: add 2.0 video to developer site feature videos
2009-10-29 14:45:20 -07:00
Dirk Dougherty
c53793d206
am 524c4e72: am 9ac642a9: am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
...
Merge commit '524c4e720d3811230ef9f1707efa280f8f00b851'
* commit '524c4e720d3811230ef9f1707efa280f8f00b851':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-29 14:44:59 -07:00
Scott Main
0ae9e101a6
am e7672d00: am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdk
...
Merge commit 'e7672d0041f7d4093cac6db1233cd22b5cc45a01' into eclair-mr2-plus-aosp
* commit 'e7672d0041f7d4093cac6db1233cd22b5cc45a01':
docs: add 2.0 video to developer site feature videos
2009-10-29 14:00:58 -07:00
Dirk Dougherty
524c4e720d
am 9ac642a9: am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
...
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.
2009-10-29 14:00:39 -07:00
Scott Main
3ebe5044aa
am cc9d066b: am 5c24774d: am 42522449: am 675eb31d: Merge change I1a010c12 into eclair-sdk
...
Merge commit 'cc9d066bf3d2bad6be5f628caa8b87158e56e246'
* commit 'cc9d066bf3d2bad6be5f628caa8b87158e56e246':
docs: fix broken link for download page.
2009-10-29 02:04:35 -07:00
Scott Main
cc9d066bf3
am 5c24774d: am 42522449: am 675eb31d: Merge change I1a010c12 into eclair-sdk
...
Merge commit '5c24774de4a25797d8a4c3f4a25f2633939a1d1a' into eclair-mr2-plus-aosp
* commit '5c24774de4a25797d8a4c3f4a25f2633939a1d1a':
docs: fix broken link for download page.
2009-10-29 01:45:40 -07: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
Scott Main
4144f04b19
am aaeafec5: am 66e69251: am 91bfbfb9: am 08c57535: docs: add 2.0 highlights doc and updated homepage
...
Merge commit 'aaeafec5cd27c9bcccd21228be1bb8cfb9615138'
* commit 'aaeafec5cd27c9bcccd21228be1bb8cfb9615138':
docs: add 2.0 highlights doc and updated homepage
2009-10-28 23:54:15 -07:00
Dirk Dougherty
94fffcd131
am 838bb989: am 53976509: am 37ebfad1: am a250f0c8: doc change: fix broken link at top of installing doc
...
Merge commit '838bb9893182b1be5a64226f0a6fd7e953815ec6'
* commit '838bb9893182b1be5a64226f0a6fd7e953815ec6':
doc change: fix broken link at top of installing doc
2009-10-28 23:53:52 -07:00
Scott Main
3cd00029b6
am 5eb80efb: am 3534dadd: docs: fix XSS vulnerability in search
...
Merge commit '5eb80efb695f73c53e5a2776c485d91ae8354eff' into eclair-plus-aosp
* commit '5eb80efb695f73c53e5a2776c485d91ae8354eff':
docs: fix XSS vulnerability in search
2009-10-28 23:40:41 -07:00
Scott Main
3534daddee
docs: fix XSS vulnerability in search
...
add a function that uses replace() to replace all
instances of '<' and '>' with the HTML entities and use
this wherever the query text is added onto the page.
2009-10-28 14:42:40 -07:00
Dirk Dougherty
a292fefeb7
am 4c071f0d: am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
...
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.
2009-10-28 12:45:22 -07:00
Scott Main
aaeafec5cd
am 66e69251: am 91bfbfb9: am 08c57535: docs: add 2.0 highlights doc and updated homepage
...
Merge commit '66e6925154a64d4fab53e6241e9e1fd227f42352' into eclair-mr2-plus-aosp
* commit '66e6925154a64d4fab53e6241e9e1fd227f42352':
docs: add 2.0 highlights doc and updated homepage
2009-10-28 12:45:03 -07:00
Dirk Dougherty
838bb98931
am 53976509: am 37ebfad1: am a250f0c8: doc change: fix broken link at top of installing doc
...
Merge commit '53976509639b136150a844ff92544f96cf048943' into eclair-mr2-plus-aosp
* commit '53976509639b136150a844ff92544f96cf048943':
doc change: fix broken link at top of installing doc
2009-10-28 12:44:46 -07:00
Scott Main
62e4a4b76c
am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdk
...
Merge commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120' into eclair-plus-aosp
* commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120':
docs: add 2.0 video to developer site feature videos
2009-10-28 11:48:01 -07:00
Dirk Dougherty
cdf2c1bf26
am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
...
Merge commit '340fbc36fb5ded7819d09d55117917b9a6361fd4' into eclair-plus-aosp
* commit '340fbc36fb5ded7819d09d55117917b9a6361fd4':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-28 11:47:47 -07:00
Android (Google) Code Review
d14f1bd7e4
Merge change Iacb6e122 into eclair-sdk
...
* changes:
docs: add 2.0 video to developer site feature videos
2009-10-28 14:27:48 -04:00
Scott Main
3141c707b8
docs: add 2.0 video to developer site feature videos
2009-10-28 11:21:31 -07:00
Android (Google) Code Review
5a4d66965d
Merge change Ib80db923 into eclair-sdk
...
* changes:
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-28 11:56:04 -04:00
Dirk Dougherty
00dc5756b1
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
...
Bug: 2160782
Change-Id: Ib80db9231f91a36f503db487982378b252c0fcd8
2009-10-27 18:58:54 -07:00
Scott Main
3a89fc4003
am 42522449: am 675eb31d: Merge change I1a010c12 into eclair-sdk
...
Merge commit '4252244939089ce0b055456335071bb7f2c0d1c3' into eclair-plus-aosp
* commit '4252244939089ce0b055456335071bb7f2c0d1c3':
docs: fix broken link for download page.
2009-10-27 17:35:23 -07:00
Android (Google) Code Review
675eb31d8d
Merge change I1a010c12 into eclair-sdk
...
* changes:
docs: fix broken link for download page.
2009-10-27 20:16:58 -04:00
Scott Main
1a010c1268
docs: fix broken link for download page.
...
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.
2009-10-27 17:02:12 -07:00
Dirk Dougherty
91eeda64b6
am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
...
Merge commit '59625fa86ad0e520931361aba120e2d868f01618' into eclair-plus-aosp
* commit '59625fa86ad0e520931361aba120e2d868f01618':
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-26 18:42:44 -07:00
Scott Main
014ec26c77
am 91bfbfb9: am 08c57535: docs: add 2.0 highlights doc and updated homepage
...
Merge commit '91bfbfb9e571cd2ee79e69d5fb1d0d2b368223c4' into eclair-plus-aosp
* commit '91bfbfb9e571cd2ee79e69d5fb1d0d2b368223c4':
docs: add 2.0 highlights doc and updated homepage
2009-10-26 18:42:15 -07:00
Dirk Dougherty
9ac042f4d7
am 37ebfad1: am a250f0c8: doc change: fix broken link at top of installing doc
...
Merge commit '37ebfad1619f250bda4803dfb8683f408d9482cb' into eclair-plus-aosp
* commit '37ebfad1619f250bda4803dfb8683f408d9482cb':
doc change: fix broken link at top of installing doc
2009-10-26 18:41:14 -07:00
Android (Google) Code Review
946f9d1edc
Merge change I020b31e1 into eclair-sdk
...
* changes:
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-26 21:24:44 -04:00
Dirk Dougherty
bf15ce6de4
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
...
Bug:2160782
Change-Id: I020b31e10f2733223aa37d03687cf8a63843afa7
2009-10-26 18:19:22 -07:00
Dirk Dougherty
00bbcb49e4
doc change: fix build from bad merge. Add missing @jd:body
...
Change-Id:Idbdeed6bce2a247188e0bfb79e0a0cdbcc44bb85
2009-10-26 17:54:37 -07:00
Scott Main
08c57535d1
docs: add 2.0 highlights doc and updated homepage
2009-10-26 17:29:23 -07:00
Dirk Dougherty
73d64fa200
am 3bf0210d: am f0d9c000: am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 into eclair-sdk
...
Merge commit '3bf0210dca67e534bf8d344575abf32e653c8407'
* commit '3bf0210dca67e534bf8d344575abf32e653c8407':
doc change: incorporate comments on SDK docs and structure.
2009-10-22 19:07:17 -07:00
Dirk Dougherty
8eef2dd945
Merge commit '9b7fb57c' into manualmerge
...
Conflicts:
docs/html/sdk/android-1.5.jd
2009-10-22 18:44:32 -07:00
Dirk Dougherty
3bf0210dca
am f0d9c000: am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 into eclair-sdk
...
Merge commit 'f0d9c0000858f3e48bcd1efec75f2dff1cbc6ed5' into eclair-mr2-plus-aosp
* commit 'f0d9c0000858f3e48bcd1efec75f2dff1cbc6ed5':
doc change: incorporate comments on SDK docs and structure.
2009-10-22 18:39:56 -07:00
Dirk Dougherty
26983c69fa
am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 into eclair-sdk
...
Merge commit '86dc4d312216be0b4c2847a1e79d94efaf4b9559' into eclair-plus-aosp
* commit '86dc4d312216be0b4c2847a1e79d94efaf4b9559':
doc change: incorporate comments on SDK docs and structure.
2009-10-22 18:13:49 -07:00
Dirk Dougherty
a250f0c808
doc change: fix broken link at top of installing doc
...
Bug: 2160782
2009-10-22 18:02:45 -07:00
Dirk Dougherty
eeb0b2514a
doc change: incorporate comments on SDK docs and structure.
...
Bug: 2160782
2009-10-22 17:35:02 -07:00
Dirk Dougherty
46b9e216a2
am 71d4da49: am 207fadf6: am f41eb87d: am 6797b9fa: doc change: add diff report 4 -> 5
...
Merge commit '71d4da499a7cea2bb3bd3a6c1ed9e8e2b6b34ba8'
* commit '71d4da499a7cea2bb3bd3a6c1ed9e8e2b6b34ba8':
doc change: add diff report 4 -> 5
2009-10-22 14:35:43 -07:00
Dirk Dougherty
4f983852fd
am 419264c2: am 875d235c: am e12191a7: am 439bf97c: doc change: edits to the screens support doc.
...
Merge commit '419264c22c8776274119e66349068f8c712b1c2f'
* commit '419264c22c8776274119e66349068f8c712b1c2f':
doc change: edits to the screens support doc.
2009-10-22 14:35:31 -07:00
Dirk Dougherty
256ca9b93c
am f80cd7bd: am 208e390a: am e5e2c167: am f4b5540b: doc change only: add screens support doc
...
Merge commit 'f80cd7bdc4e6c1c83afb19650e9177ec5e0d8d6f'
* commit 'f80cd7bdc4e6c1c83afb19650e9177ec5e0d8d6f':
doc change only: add screens support doc
2009-10-22 14:35:17 -07:00
Scott Main
3f3b61bd97
resolved conflicts for merge of 618ae454 to master
2009-10-22 14:29:35 -07:00
