1903 Commits

Author SHA1 Message Date
Dirk Dougherty
b11f8a216f am d47fad27: am 055b4392: Merge change I0a17a960 into eclair
Merge commit 'd47fad27d76527dfa27f6c5425cc4074f6c3a158' into eclair-mr2-plus-aosp

* commit 'd47fad27d76527dfa27f6c5425cc4074f6c3a158':
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
2009-11-20 13:18:25 -08:00
Dirk Dougherty
ab8e7b207f am 055b4392: Merge change I0a17a960 into eclair
Merge commit '055b439289f38c5a1d3bd43c0e218a4cbb93773d' into eclair-plus-aosp

* commit '055b439289f38c5a1d3bd43c0e218a4cbb93773d':
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
2009-11-20 13:12:39 -08:00
Android (Google) Code Review
055b439289 Merge change I0a17a960 into eclair
* changes:
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
2009-11-20 13:08:06 -08:00
Dirk Dougherty
0a056afb71 sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
Bug:2160782
Change-Id: I0a17a9603b53a46a3a434f29bcd72208af1a745b
2009-11-20 11:17:26 -08:00
Scott Main
da21830f47 am cfd1458a: am 9d6704f9: am d2a9f54f: am afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit 'cfd1458a768cb4bc28fa84093e30809ba1e6bfd9'

* commit 'cfd1458a768cb4bc28fa84093e30809ba1e6bfd9':
  docs: misc edits to samples page and intro docs
2009-11-18 18:01:41 -08:00
Scott Main
cfd1458a76 am 9d6704f9: am d2a9f54f: am afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit '9d6704f9f1d078f066fb8f5568179fd0743de406' into eclair-mr2-plus-aosp

* commit '9d6704f9f1d078f066fb8f5568179fd0743de406':
  docs: misc edits to samples page and intro docs
2009-11-18 17:55:27 -08:00
Scott Main
e252b2170e am d2a9f54f: am afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit 'd2a9f54f9ec997562623091d404e0208fd9ce5f8' into eclair-plus-aosp

* commit 'd2a9f54f9ec997562623091d404e0208fd9ce5f8':
  docs: misc edits to samples page and intro docs
2009-11-18 17:48:13 -08:00
Android (Google) Code Review
afcd516e3e Merge change Iaae72f66 into eclair-sdk
* changes:
  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.
2009-11-18 14:08:08 -08:00
Scott Main
9c9e67aca4 resolved conflicts for merge of bc1add83 to master 2009-11-17 11:13:31 -08:00
Scott Main
bc1add83e1 am 4b26bab8: am 06ddc677: am 00ecac95: Merge change If556e259 into eclair-sdk
Merge commit '4b26bab8a455050b3d337725ab30ac2da0379cbe' into eclair-mr2-plus-aosp

* commit '4b26bab8a455050b3d337725ab30ac2da0379cbe':
  docs: remove all content from the older sdk download,
2009-11-16 20:05:38 -08:00
Scott Main
6fb8188a88 am 06ddc677: am 00ecac95: Merge change If556e259 into eclair-sdk
Merge commit '06ddc67797388da6260e43579c7ebd506b5b376c' into eclair-plus-aosp

* commit '06ddc67797388da6260e43579c7ebd506b5b376c':
  docs: remove all content from the older sdk download,
2009-11-16 18:30:28 -08:00
Android (Google) Code Review
00ecac957c Merge change If556e259 into eclair-sdk
* changes:
  docs: remove all content from the older sdk download, install, and requirements pages and redirect to the new sdk pages. Also update the "older sdks" doc to include all version-specific sdks. also update the robots file to disallow indexing of the old sdk docs.
2009-11-16 18:19:10 -08:00
Scott Main
8ef5a6b6ae docs: remove all content from the older sdk download,
install, and requirements pages and redirect to the new sdk
pages. Also update the "older sdks"
doc to include all version-specific sdks.
also update the robots file to disallow indexing
of the old sdk docs.
2009-11-16 17:39:52 -08:00
Scott Main
351367ca1a am 63070f08: am 8faa61c3: am be9060b5: am 59450740: Merge change I0b0a4d6a into eclair-sdk
Merge commit '63070f08a65d2e5c4d7b6e6969689720dcaf7a4b'

* commit '63070f08a65d2e5c4d7b6e6969689720dcaf7a4b':
  docs: update the publishing guide to revise the updating section
2009-11-16 14:52:42 -08:00
Scott Main
63070f08a6 am 8faa61c3: am be9060b5: am 59450740: Merge change I0b0a4d6a into eclair-sdk
Merge commit '8faa61c3304392a9ab02387b1adad49dc8a5e488' into eclair-mr2-plus-aosp

* commit '8faa61c3304392a9ab02387b1adad49dc8a5e488':
  docs: update the publishing guide to revise the updating section
2009-11-16 14:35:10 -08:00
Scott Main
dbaf472566 am be9060b5: am 59450740: Merge change I0b0a4d6a into eclair-sdk
Merge commit 'be9060b5d944a2b9ac5a0bdc018b4741dc2cd531' into eclair-plus-aosp

* commit 'be9060b5d944a2b9ac5a0bdc018b4741dc2cd531':
  docs: update the publishing guide to revise the updating section
2009-11-15 19:23:20 -08:00
Scott Main
bbfc44acab docs: update the publishing guide to revise the updating section
bug 1755357
2009-11-12 21:44:58 -08:00
Dirk Dougherty
9ebb159c4e am bd079ec8: am aca2c4df: am 84241293: am 3a103a87: Merge change I15536f3c into eclair-sdk
Merge commit 'bd079ec854ba9200db94bffb2ed054a4f67fec4b'

* commit 'bd079ec854ba9200db94bffb2ed054a4f67fec4b':
  doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
2009-11-10 09:50:20 -08:00
Dirk Dougherty
bd079ec854 am aca2c4df: am 84241293: am 3a103a87: Merge change I15536f3c into eclair-sdk
Merge commit 'aca2c4dfbf0c92424cb9325976bbd9d81c16501b' into eclair-mr2-plus-aosp

* commit 'aca2c4dfbf0c92424cb9325976bbd9d81c16501b':
  doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
2009-11-10 09:44:08 -08:00
Dirk Dougherty
d9d9d45853 am 84241293: am 3a103a87: Merge change I15536f3c into eclair-sdk
Merge commit '84241293129423a1ebd7261e8139cfb20049535f' into eclair-plus-aosp

* commit '84241293129423a1ebd7261e8139cfb20049535f':
  doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
2009-11-10 09:38:43 -08:00
Android (Google) Code Review
3a103a87b0 Merge change I15536f3c into eclair-sdk
* changes:
  doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
2009-11-10 09:13:29 -08:00
Dirk Dougherty
a374f51f18 doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
Bug: 2246467
Change-Id: I15536f3c7f2088fff8f60963ba23a69b1be43804
2009-11-10 08:41:20 -08:00
Scott Main
95594cce49 am 022a38a0: am 3bde388a: am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdk
Merge commit '022a38a00a460dae1f45bb532780b519048e2dd8'

* commit '022a38a00a460dae1f45bb532780b519048e2dd8':
  docs: add new document for the win usb driver;
2009-11-06 16:22:30 -08:00
Scott Main
022a38a00a am 3bde388a: am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdk
Merge commit '3bde388ac2b80c9d86553552eaddf762fc9514a4' into eclair-mr2-plus-aosp

* commit '3bde388ac2b80c9d86553552eaddf762fc9514a4':
  docs: add new document for the win usb driver;
2009-11-06 16:10:19 -08:00
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