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

537 Commits

Author SHA1 Message Date
Trevor Johns
0b93e39f52 am 8a00170a: am 1d3a94a8: am abd6c278: Merge change I54400322 into eclair 
Merge commit '8a00170ad077e73fee4b379d15015b880ba39fde'

* commit '8a00170ad077e73fee4b379d15015b880ba39fde':
  Adding screenshots for development/samples/ContactManager documentation.
 2009-12-10 23:42:44 -08:00
Roman Nurik
87e9b8f14e am 05bbeb35: am 7eb6ec1f: Merge change I18305fec into eclair 
Merge commit '05bbeb356286bfb6ddc26ac546cce03334e346dd' into eclair-mr2-plus-aosp

* commit '05bbeb356286bfb6ddc26ac546cce03334e346dd':
  Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
 2009-12-10 19:57:39 -08:00
Roman Nurik
05bbeb3562 am 7eb6ec1f: Merge change I18305fec into eclair 
Merge commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1' into eclair-mr2

* commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1':
  Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
 2009-12-10 19:48:47 -08:00
Trevor Johns
c267c90100 am 9de0dba3: am b9b45a5e: Merge change I24bb662a into eclair 
Merge commit '9de0dba37cdb74a21e561c5235757318f1812e3d' into eclair-mr2-plus-aosp

* commit '9de0dba37cdb74a21e561c5235757318f1812e3d':
  Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
 2009-12-10 18:08:17 -08:00
Scott Main
94065a29c1 am f210f048: am 88ff62db: Merge change I06398298 into eclair 
Merge commit 'f210f048f754e5c39c192ecdbadd3aeac26471ed' into eclair-mr2-plus-aosp

* commit 'f210f048f754e5c39c192ecdbadd3aeac26471ed':
  docs: add images used in BT developer guide.
 2009-12-10 18:07:53 -08:00
Trevor Johns
9de0dba37c am b9b45a5e: Merge change I24bb662a into eclair 
Merge commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989' into eclair-mr2

* commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989':
  Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
 2009-12-10 17:57:59 -08:00
Scott Main
f210f048f7 am 88ff62db: Merge change I06398298 into eclair 
Merge commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1' into eclair-mr2

* commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1':
  docs: add images used in BT developer guide.
 2009-12-10 17:56:28 -08:00
Scott Main
4570dfa201 am 7b0463a9: am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs 
Merge commit '7b0463a949b57620680b95e45c66a05f67426b74' into eclair-mr2-plus-aosp

* commit '7b0463a949b57620680b95e45c66a05f67426b74':
  docs: add the Bluetooth developer guide,
 2009-12-10 17:53:27 -08:00
Trevor Johns
8a00170ad0 am 1d3a94a8: am abd6c278: Merge change I54400322 into eclair 
Merge commit '1d3a94a8b4972f28c75c2d01ed4cf686a47ca6d8' into eclair-mr2-plus-aosp

* commit '1d3a94a8b4972f28c75c2d01ed4cf686a47ca6d8':
  Adding screenshots for development/samples/ContactManager documentation.
 2009-12-10 17:53:12 -08:00
Scott Main
7b0463a949 am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs 
Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-mr2

* commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379':
  docs: add the Bluetooth developer guide,
 2009-12-10 17:42:55 -08:00
Trevor Johns
1d3a94a8b4 am abd6c278: Merge change I54400322 into eclair 
Merge commit 'abd6c2782d1fe9816068003bc1d143dedd42de81' into eclair-mr2

* commit 'abd6c2782d1fe9816068003bc1d143dedd42de81':
  Adding screenshots for development/samples/ContactManager documentation.
 2009-12-10 17:41:45 -08:00
Roman Nurik
71e43b4962 am 7eb6ec1f: Merge change I18305fec into eclair 
Merge commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1' into eclair-plus-aosp

* commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1':
  Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
 2009-12-10 17:07:00 -08:00
Roman Nurik
0e71bdc6ac Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file. 2009-12-10 11:45:33 -08:00
Dianne Hackborn
b2909dbb87 am aeabdf32: am 0766b2d0: Update service example code. 
Merge commit 'aeabdf32a2a38c1627102b90628b7261447d3a5c'

* commit 'aeabdf32a2a38c1627102b90628b7261447d3a5c':
  Update service example code.
 2009-12-10 07:00:47 -08:00
Trevor Johns
e4bb6e6377 am b9b45a5e: Merge change I24bb662a into eclair 
Merge commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989' into eclair-plus-aosp

* commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989':
  Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
 2009-12-09 23:46:01 -08:00
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
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
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
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
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