drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,720 Commits 1 Branch 0 Tags
Commit Graph

719 Commits

Author SHA1 Message Date
Android (Google) Code Review
43810507b7 Merge change Ic8231560 into eclair 
* changes:
  sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
 2009-12-01 22:41:22 -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
Scott Main
0421ccc294 am 1109703c: am 03828c0e: am 0bd1eeaf: Merge change I21a67b8d into eclair 
Merge commit '1109703c5928726a0f509d065286abb04dbc474a'

* commit '1109703c5928726a0f509d065286abb04dbc474a':
  docs: remove droid-specific behavior change from platform notes
 2009-12-01 18:53:54 -08:00
Scott Main
1109703c59 am 03828c0e: am 0bd1eeaf: Merge change I21a67b8d into eclair 
Merge commit '03828c0e675ea2cfb2141dd56d9b2bebc2570646' into eclair-mr2-plus-aosp

* commit '03828c0e675ea2cfb2141dd56d9b2bebc2570646':
  docs: remove droid-specific behavior change from platform notes
 2009-12-01 18:44:02 -08:00
Scott Main
a6d1a8fc18 am 0bd1eeaf: Merge change I21a67b8d into eclair 
Merge commit '0bd1eeaf90d854c487feb8ee35c5c74af28ebc74' into eclair-plus-aosp

* commit '0bd1eeaf90d854c487feb8ee35c5c74af28ebc74':
  docs: remove droid-specific behavior change from platform notes
 2009-11-30 17:42:35 -08:00
Scott Main
21a67b8d97 docs: remove droid-specific behavior change from platform notes 
bug: 2293281
 2009-11-30 16:20:22 -08:00
Dirk Dougherty
5a25769584 am dd6a5895: am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels. 
Merge commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979'

* commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
 2009-11-23 16:05:56 -08:00
Dirk Dougherty
dd6a5895f1 am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels. 
Merge commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c' into eclair-mr2-plus-aosp

* commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
 2009-11-23 14:31:01 -08:00
Dirk Dougherty
b491e59ea2 am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels. 
Merge commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e' into eclair-plus-aosp

* commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
 2009-11-23 13:55:11 -08:00
Dirk Dougherty
bca9f1bbb3 sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels. 
Bug: 2160782
Change-Id: Ia576dc9b2312d89bbe194d94640c3cc79216067b
 2009-11-23 13:23:46 -08:00
Scott Main
71372be6c2 am acedb7d0: am 30a4b8a1: am 256da9fb: am 160ab363: Merge change I0c172ebf into eclair-sdk 
Merge commit 'acedb7d0c3452ff7347fec8f643034e938a55137'

* commit 'acedb7d0c3452ff7347fec8f643034e938a55137':
  docs change for ESR: add platform notes document for
 2009-11-20 17:19:51 -08:00
Scott Main
acedb7d0c3 am 30a4b8a1: am 256da9fb: am 160ab363: Merge change I0c172ebf into eclair-sdk 
Merge commit '30a4b8a180813ae9a1846fdd7219ebe5592eb06b' into eclair-mr2-plus-aosp

* commit '30a4b8a180813ae9a1846fdd7219ebe5592eb06b':
  docs change for ESR: add platform notes document for
 2009-11-20 17:12:37 -08:00
Scott Main
30b68bae3b am 256da9fb: am 160ab363: Merge change I0c172ebf into eclair-sdk 
Merge commit '256da9fb007ac0722a5b1854befda7e7bed2564e' into eclair-plus-aosp

* commit '256da9fb007ac0722a5b1854befda7e7bed2564e':
  docs change for ESR: add platform notes document for
 2009-11-20 17:07:27 -08:00
Scott Main
256da9fb00 am 160ab363: Merge change I0c172ebf into eclair-sdk 
Merge commit '160ab363d738728456d561bb80d54d3448e7580a' into eclair

* commit '160ab363d738728456d561bb80d54d3448e7580a':
  docs change for ESR: add platform notes document for
 2009-11-20 17:03:29 -08:00
Scott Main
2edbbafdd5 docs change for ESR: add platform notes document for 
Android 2.0.1. Also update the homepage sdk and adp announcements.

Bug: 2160782
Change-Id: I0c172ebf9449ac99865433b51a0a7366aa2ef020
 2009-11-20 16:53:01 -08:00
Dirk Dougherty
9aaa087c96 am b11f8a21: am d47fad27: am 055b4392: Merge change I0a17a960 into eclair 
Merge commit 'b11f8a216f326a96bbdb08b470a7de8c2fa81edf'

* commit 'b11f8a216f326a96bbdb08b470a7de8c2fa81edf':
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
 2009-11-20 13:22:59 -08:00
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