Trevor Johns
24bb662a13
Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
2009-12-09 20:30:54 -08:00
Scott Main
fbdd809d84
am 88ff62db: Merge change I06398298 into eclair
...
Merge commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1' into eclair-plus-aosp
* commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1':
docs: add images used in BT developer guide.
2009-12-09 18:25:37 -08:00
Scott Main
fe7f27aabf
docs: add images used in BT developer guide.
...
needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b
2009-12-09 18:16:02 -08:00
Scott Main
0ee7706c59
am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
...
Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-plus-aosp
* commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379':
docs: add the Bluetooth developer guide,
2009-12-09 18:06:58 -08:00
Scott Main
ed2a70d649
docs: add the Bluetooth developer guide,
...
and make some revisions to the BT javadocs
2009-12-09 17:59:38 -08:00
Trevor Johns
325edc5445
am abd6c278: Merge change I54400322 into eclair
...
Merge commit 'abd6c2782d1fe9816068003bc1d143dedd42de81' into eclair-plus-aosp
* commit 'abd6c2782d1fe9816068003bc1d143dedd42de81':
Adding screenshots for development/samples/ContactManager documentation.
2009-12-09 17:55:37 -08:00
Dianne Hackborn
aeabdf32a2
am 0766b2d0: Update service example code.
...
Merge commit '0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp
* commit '0766b2d0f398dcad10e332b695bbc0cbe5011882':
Update service example code.
2009-12-09 15:41:30 -08:00
Trevor Johns
17d8e74747
Adding screenshots for development/samples/ContactManager documentation.
2009-12-08 23:29:46 -08:00
Dianne Hackborn
0766b2d0f3
Update service example code.
...
Switch aidl sample to match the change in ApiDemos, add sample code
to the Service class.
2009-12-07 18:06:09 -08:00
Scott Main
6b004b350f
am 0633dc49: am e08361d7: am 5d0806c9: Merge change Ia70bd8c4 into eclair
...
Merge commit '0633dc49fa7862bcd519555ec73803ab6379229d'
* commit '0633dc49fa7862bcd519555ec73803ab6379229d':
add BluetoothChat sample app to the dev guide
2009-12-04 04:30:13 -08:00
Scott Main
6b661d28a0
am ea01f514: am 7f1ab539: am 90d311ff: Merge change I33e0f00e into eclair
...
Merge commit 'ea01f514e161a2310fd21d8aef8a4b3aaca4ac7b'
* commit 'ea01f514e161a2310fd21d8aef8a4b3aaca4ac7b':
docs: fix markup error in xml sample
2009-12-04 04:26:33 -08:00
Scott Main
0633dc49fa
am e08361d7: am 5d0806c9: Merge change Ia70bd8c4 into eclair
...
Merge commit 'e08361d7fda2234f447f4ffb7f480d045f8c5f78' into eclair-mr2-plus-aosp
* commit 'e08361d7fda2234f447f4ffb7f480d045f8c5f78':
add BluetoothChat sample app to the dev guide
2009-12-03 16:50:42 -08:00
Scott Main
ea01f514e1
am 7f1ab539: am 90d311ff: Merge change I33e0f00e into eclair
...
Merge commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b' into eclair-mr2-plus-aosp
* commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b':
docs: fix markup error in xml sample
2009-12-03 16:35:39 -08:00
Scott Main
4bc7e53517
am 5d0806c9: Merge change Ia70bd8c4 into eclair
...
Merge commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-plus-aosp
* commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
add BluetoothChat sample app to the dev guide
2009-12-03 16:14:32 -08:00
Android (Google) Code Review
5d0806c9c3
Merge change Ia70bd8c4 into eclair
...
* changes:
add BluetoothChat sample app to the dev guide
2009-12-03 16:06:52 -08:00
Scott Main
14a704295f
add BluetoothChat sample app to the dev guide
2009-12-03 15:42:50 -08:00
Scott Main
0fed723ba4
am 90d311ff: Merge change I33e0f00e into eclair
...
Merge commit '90d311ff33f33024f642ef03a02fb62566c9f46b' into eclair-plus-aosp
* commit '90d311ff33f33024f642ef03a02fb62566c9f46b':
docs: fix markup error in xml sample
2009-12-03 11:54:36 -08:00
Scott Main
33e0f00e95
docs: fix markup error in xml sample
2009-12-03 11:33:25 -08:00
Scott Main
5c83bfaf11
am da5a110b: am 7863eb11: am 525bfe89: Merge change I9fb53a9c into eclair
...
Merge commit 'da5a110b8aae83cab96c3f77da95f8f85cc0e0d5'
* commit 'da5a110b8aae83cab96c3f77da95f8f85cc0e0d5':
add screenshots for the Bluetooth Chat sample app
2009-12-02 20:42:54 -08:00
Dirk Dougherty
0f29956e43
am fe4e74b6: am 233c50e4: am 43810507: Merge change Ic8231560 into eclair
...
Merge commit 'fe4e74b62de9348b6bf3322735e7fba090e3dd72'
* commit 'fe4e74b62de9348b6bf3322735e7fba090e3dd72':
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-02 20:28:55 -08:00
Scott Main
da5a110b8a
am 7863eb11: am 525bfe89: Merge change I9fb53a9c into eclair
...
Merge commit '7863eb11265cd06ee35a670b5e994d65e31337c3' into eclair-mr2-plus-aosp
* commit '7863eb11265cd06ee35a670b5e994d65e31337c3':
add screenshots for the Bluetooth Chat sample app
2009-12-02 16:16:45 -08:00
Scott Main
3e0d5a964f
am 525bfe89: Merge change I9fb53a9c into eclair
...
Merge commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a' into eclair-plus-aosp
* commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a':
add screenshots for the Bluetooth Chat sample app
2009-12-02 15:49:27 -08:00
Scott Main
9fb53a9cb9
add screenshots for the Bluetooth Chat sample app
2009-12-02 15:08:19 -08:00
Dirk Dougherty
fe4e74b62d
am 233c50e4: am 43810507: Merge change Ic8231560 into eclair
...
Merge commit '233c50e4aa6de6f77b90c5c65f956f9f4251b5a9' into eclair-mr2-plus-aosp
* commit '233c50e4aa6de6f77b90c5c65f956f9f4251b5a9':
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-02 09:57:17 -08:00
Dirk Dougherty
f37314c2be
am 43810507: Merge change Ic8231560 into eclair
...
Merge commit '43810507b75cd492e8177ee082e688f87f0ab49c' into eclair-plus-aosp
* commit '43810507b75cd492e8177ee082e688f87f0ab49c':
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-01 22:46:30 -08:00
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
