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

355 Commits

Author SHA1 Message Date
Scott Main
c49f864695 resolved conflicts for merge of aaf8a9d8 to master 2009-12-16 11:08:26 -08:00
Katarina Stenstedt
b5362167ab am f0165495: am 9d2252db: Merge change Ia36d8e74 into eclair 
Merge commit 'f0165495951e3a32aa5697ac1299307c2d72f32a'

* commit 'f0165495951e3a32aa5697ac1299307c2d72f32a':
  Updates to SDK troubleshooting doc, per bug 2315781.
 2009-12-16 10:32:29 -08:00
Dirk Dougherty
c0d7e1ccda am 4a2d630f: am 6ccc515c: Merge change I8385f59d into eclair 
Merge commit '4a2d630f686c44fb2a77c90bc6cf87779725abe2'

* commit '4a2d630f686c44fb2a77c90bc6cf87779725abe2':
  sdk doc change for esr: Cleanup for resources tab content.
 2009-12-16 10:32:20 -08:00
Scott Main
aaf8a9d885 am 218c0763: Merge change Ib43ec8f6 into eclair 
Merge commit '218c0763d5122ed975af7b9bd67e22def6364a23' into eclair-plus-aosp

* commit '218c0763d5122ed975af7b9bd67e22def6364a23':
  docs: fix some typos in the manifest docs samples and
 2009-12-16 10:28:11 -08:00
Katarina Stenstedt
f016549595 am 9d2252db: Merge change Ia36d8e74 into eclair 
Merge commit '9d2252db2cd82535f475fc3823e6e7c60cf17038' into eclair-plus-aosp

* commit '9d2252db2cd82535f475fc3823e6e7c60cf17038':
  Updates to SDK troubleshooting doc, per bug 2315781.
 2009-12-16 10:28:06 -08:00
Dirk Dougherty
4a2d630f68 am 6ccc515c: Merge change I8385f59d into eclair 
Merge commit '6ccc515c7f705a66718d0138a421e29186667b9e' into eclair-plus-aosp

* commit '6ccc515c7f705a66718d0138a421e29186667b9e':
  sdk doc change for esr: Cleanup for resources tab content.
 2009-12-16 10:27:47 -08:00
Android (Google) Code Review
218c0763d5 Merge change Ib43ec8f6 into eclair 
* changes:
  docs: fix some typos in the manifest docs samples and remove the "one or more of" phrase from the syntax snippet because it interferes with the syntax coloring.
 2009-12-16 10:05:10 -08:00
Android (Google) Code Review
9d2252db2c Merge change Ia36d8e74 into eclair 
* changes:
  Updates to SDK troubleshooting doc, per bug 2315781.
 2009-12-16 09:59:12 -08:00
Dirk Dougherty
50bfb39c55 sdk doc change for esr: Cleanup for resources tab content. 
Bug:2160782
Change-Id: I8385f59d764156ccc318f71e5d344c7f33330c40
 2009-12-15 19:24:58 -08:00
Dirk Dougherty
692bf86e67 am 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair 
Merge commit '479a49f74f77855825ba69b105c065422c24246a'

* commit '479a49f74f77855825ba69b105c065422c24246a':
  sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
 2009-12-15 15:04:00 -08:00
Katarina Stenstedt
4075b4ced4 Updates to SDK troubleshooting doc, per bug 2315781. 
Describes work-around for these problems: Sometimes you
can't view manifest files within Eclipse; you can't run
the GestureBuilder sample on the emulator or uninstall it
from the emulator.

Bug: 2315781
Change-Id: Ia36d8e74a9fccd106ce2cc5e9451846aacba9da4
 2009-12-15 12:41:24 -08:00
Dirk Dougherty
479a49f74f am 7585586c: Merge change Ib1eb2e9e into eclair 
Merge commit '7585586ce5b5de699b95125672e29eaf70876727' into eclair-plus-aosp

* commit '7585586ce5b5de699b95125672e29eaf70876727':
  sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
 2009-12-15 07:40:02 -08:00
Scott Main
b43ec8f631 docs: fix some typos in the manifest docs samples and 
remove the "one or more of" phrase from the syntax snippet
because it interferes with the syntax coloring.
 2009-12-14 14:37:53 -08:00
Dirk Dougherty
22558d0be8 sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes. 
Bug: 2160782
Change-Id: Ib1eb2e9e3fe3a7b2ad16387dbf888646a1195221
 2009-12-14 11:40:02 -08:00
Roman Nurik
f381c242cc am 87e9b8f1: am 05bbeb35: am 7eb6ec1f: Merge change I18305fec into eclair 
Merge commit '87e9b8f14e0555351b892cf67578a7d26c4505c8'

* commit '87e9b8f14e0555351b892cf67578a7d26c4505c8':
  Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
 2009-12-11 01:40:06 -08:00
Trevor Johns
28b811144e am c267c901: am 9de0dba3: am b9b45a5e: Merge change I24bb662a into eclair 
Merge commit 'c267c90100ff09ab1ca6b09d6eae23594d699536'

* commit 'c267c90100ff09ab1ca6b09d6eae23594d699536':
  Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
 2009-12-10 23:46:23 -08:00
Scott Main
514ef96827 am 94065a29: am f210f048: am 88ff62db: Merge change I06398298 into eclair 
Merge commit '94065a29c1c68ecf6aa0979a4c91f2616227f264'

* commit '94065a29c1c68ecf6aa0979a4c91f2616227f264':
  docs: add images used in BT developer guide.
 2009-12-10 23:45:48 -08:00
Scott Main
f1ec19e0f3 am 4570dfa2: am 7b0463a9: am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs 
Merge commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d'

* commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d':
  docs: add the Bluetooth developer guide,
 2009-12-10 23:43:12 -08:00
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