Scott Main
6e1ae685d9
am e46b2853: am 26099cd9: Merge change I7d67e1b3 into eclair
...
Merge commit 'e46b2853deff2dde83d20616b6023984fdd6c19c'
* commit 'e46b2853deff2dde83d20616b6023984fdd6c19c':
docs: small edits
2009-12-16 18:25:39 -08:00
Scott Main
e46b2853de
am 26099cd9: Merge change I7d67e1b3 into eclair
...
Merge commit '26099cd9ce44ef26ab3c9b342ec1a305c61b7a7c' into eclair-plus-aosp
* commit '26099cd9ce44ef26ab3c9b342ec1a305c61b7a7c':
docs: small edits
2009-12-16 18:22:44 -08:00
Android (Google) Code Review
26099cd9ce
Merge change I7d67e1b3 into eclair
...
* changes:
docs: small edits
2009-12-16 18:20:05 -08:00
Scott Main
7d67e1b365
docs: small edits
2009-12-16 18:14:37 -08:00
Scott Main
4c83f40bdb
am 7ddb938c: am b2aab504: Merge change I354261e2 into eclair
...
Merge commit '7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9'
* commit '7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9':
docs: small edit to live wallpaper sentence
2009-12-16 15:52:32 -08:00
Trevor Johns
15e1e70532
am 50e72439: am 5ff60dff: Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
...
Merge commit '50e72439648dc36205ad307a07f3050270346308'
* commit '50e72439648dc36205ad307a07f3050270346308':
Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
2009-12-16 15:52:22 -08:00
Scott Main
7ddb938c6c
am b2aab504: Merge change I354261e2 into eclair
...
Merge commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7' into eclair-plus-aosp
* commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7':
docs: small edit to live wallpaper sentence
2009-12-16 15:32:22 -08:00
Trevor Johns
50e7243964
am 5ff60dff: Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
...
Merge commit '5ff60dff181fc4982c822ef97e14a293af66a246' into eclair-plus-aosp
* commit '5ff60dff181fc4982c822ef97e14a293af66a246':
Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
2009-12-16 15:32:16 -08:00
Android (Google) Code Review
b2aab5042b
Merge change I354261e2 into eclair
...
* changes:
docs: small edit to live wallpaper sentence
2009-12-16 15:30:02 -08:00
Scott Main
354261e25a
docs: small edit to live wallpaper sentence
2009-12-16 15:25:35 -08:00
Trevor Johns
5ff60dff18
Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
2009-12-16 15:14:43 -08:00
Scott Main
1e5710ce6f
am 73536dda: am d92cc9a4: Merge change I33eb64c0 into eclair
...
Merge commit '73536dda20594e4b5e83396d705127a823bfa362'
* commit '73536dda20594e4b5e83396d705127a823bfa362':
docs: add 2.1 platform notes, win usb driver notes
2009-12-16 11:20:22 -08:00
Scott Main
18a2788695
am 8bda0fb0: Merge change Iccb92649 into eclair
...
Merge commit '8bda0fb0ca24875ad6084f35250f166b45f967a1' into eclair-plus-aosp
* commit '8bda0fb0ca24875ad6084f35250f166b45f967a1':
docs: fix typo
2009-12-16 11:18:00 -08:00
Scott Main
73536dda20
am d92cc9a4: Merge change I33eb64c0 into eclair
...
Merge commit 'd92cc9a4ba2cf38f133cc2b51fe1cd0be8659db9' into eclair-plus-aosp
* commit 'd92cc9a4ba2cf38f133cc2b51fe1cd0be8659db9':
docs: add 2.1 platform notes, win usb driver notes
2009-12-16 11:17:54 -08:00
Android (Google) Code Review
8bda0fb0ca
Merge change Iccb92649 into eclair
...
* changes:
docs: fix typo
2009-12-16 11:14:40 -08:00
Scott Main
ccb926498f
docs: fix typo
2009-12-16 11:13:40 -08:00
Scott Main
81e886aa3d
am eab4fe7a: am 4c4a47f4: docs: add developer dashboard page and add topic link to it from the homepage (replacing the video topic)
...
Merge commit 'eab4fe7a425532717bfc948430de73637ed81c84'
* commit 'eab4fe7a425532717bfc948430de73637ed81c84':
docs: add developer dashboard page and add topic link
2009-12-16 11:11:35 -08:00
Android (Google) Code Review
d92cc9a4ba
Merge change I33eb64c0 into eclair
...
* changes:
docs: add 2.1 platform notes, win usb driver notes and fix some javadocs for PhonestateListener
2009-12-16 11:11:02 -08:00
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
eab4fe7a42
am 4c4a47f4: docs: add developer dashboard page and add topic link to it from the homepage (replacing the video topic)
...
Merge commit '4c4a47f42101a57ab8ff05a8e035d97582c3368a' into eclair-plus-aosp
* commit '4c4a47f42101a57ab8ff05a8e035d97582c3368a':
docs: add developer dashboard page and add topic link
2009-12-16 10:28:16 -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
Scott Main
4c4a47f421
docs: add developer dashboard page and add topic link
...
to it from the homepage (replacing the video topic)
2009-12-16 10:08:32 -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
Scott Main
b149ee8835
docs: add 2.1 platform notes, win usb driver notes
...
and fix some javadocs for PhonestateListener
2009-12-16 09:50:53 -08:00
Android (Google) Code Review
6ccc515c7f
Merge change I8385f59d into eclair
...
* changes:
sdk doc change for esr: Cleanup for resources tab content.
2009-12-15 21:24:15 -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
Trevor Johns
d3f237a538
am 3a0d1a46: am 311bb7fc: Merge change I0c8814d1 into eclair
...
Merge commit '3a0d1a46294eb182a66bef69f4037a9b40820e2c'
* commit '3a0d1a46294eb182a66bef69f4037a9b40820e2c':
Removing copyrighted backgrounds/logos from ContactManager and Wiktionary
2009-12-15 15:04:28 -08:00
Trevor Johns
53887d4fde
am a7cd86f9: am 7c0f00cc: Adding list of articles to docs/html/resources/articles/index.jd.
...
Merge commit 'a7cd86f9ef220be04eb020f9de3fefaf741b791c'
* commit 'a7cd86f9ef220be04eb020f9de3fefaf741b791c':
Adding list of articles to docs/html/resources/articles/index.jd.
2009-12-15 15:04:09 -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
Trevor Johns
3a0d1a4629
am 311bb7fc: Merge change I0c8814d1 into eclair
...
Merge commit '311bb7fcc145115675adc7e5f1567dce479d4899' into eclair-plus-aosp
* commit '311bb7fcc145115675adc7e5f1567dce479d4899':
Removing copyrighted backgrounds/logos from ContactManager and Wiktionary
2009-12-15 07:42:59 -08:00
Trevor Johns
a7cd86f9ef
am 7c0f00cc: Adding list of articles to docs/html/resources/articles/index.jd.
...
Merge commit '7c0f00ccddc96cc6b30e8aa53c5219543523cf48' into eclair-plus-aosp
* commit '7c0f00ccddc96cc6b30e8aa53c5219543523cf48':
Adding list of articles to docs/html/resources/articles/index.jd.
2009-12-15 07:40:52 -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
Android (Google) Code Review
311bb7fcc1
Merge change I0c8814d1 into eclair
...
* changes:
Removing copyrighted backgrounds/logos from ContactManager and Wiktionary samples.
2009-12-14 21:34:44 -08:00
Trevor Johns
1ff123d794
Removing copyrighted backgrounds/logos from ContactManager and Wiktionary
...
samples.
Bug: 2326131
2009-12-14 18:55:44 -08:00
Trevor Johns
7c0f00ccdd
Adding list of articles to docs/html/resources/articles/index.jd.
2009-12-14 16:08:05 -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
