Scott Main
3a9b03425b
am a2bca747: am a25032a0: Merge change Ic31c0f62 into eclair
...
Merge commit 'a2bca7477d803541c5a48cc7624e2b6c305c5970'
* commit 'a2bca7477d803541c5a48cc7624e2b6c305c5970':
docs: update the Bluetooth guide with links to the sample
2009-12-18 17:18:54 -08:00
Scott Main
a2bca7477d
am a25032a0: Merge change Ic31c0f62 into eclair
...
Merge commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad' into eclair-plus-aosp
* commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad':
docs: update the Bluetooth guide with links to the sample
2009-12-18 17:15:38 -08:00
Android (Google) Code Review
a25032a08d
Merge change Ic31c0f62 into eclair
...
* changes:
docs: update the Bluetooth guide with links to the sample app, scrub the sibling files, and revise the Bluetooth package summary to point to the BT dev guide.
2009-12-18 17:12:36 -08:00
Dirk Dougherty
48f19812c7
am 98a48f0f: am 5da76ddd: doc change: Add ?details query to doc about Android Market.
...
Merge commit '98a48f0fd3af5fec833dab44da17f8911e95d147'
* commit '98a48f0fd3af5fec833dab44da17f8911e95d147':
doc change: Add ?details query to doc about Android Market.
2009-12-17 17:38:49 -08:00
Dirk Dougherty
98a48f0fd3
am 5da76ddd: doc change: Add ?details query to doc about Android Market.
...
Merge commit '5da76ddd575b22d45bbea0155f62c7c32e1a510e' into eclair-plus-aosp
* commit '5da76ddd575b22d45bbea0155f62c7c32e1a510e':
doc change: Add ?details query to doc about Android Market.
2009-12-17 17:35:58 -08:00
Dirk Dougherty
5da76ddd57
doc change: Add ?details query to doc about Android Market.
...
Bug: 2160782
Change-Id: I86d1339e5bc5a36dbd033a7938764818a27b4d81
2009-12-17 17:13:04 -08:00
Dirk Dougherty
7f6f631070
am fe3ad191: am 24780ea6: Merge change I75bb4c98 into eclair
...
Merge commit 'fe3ad1913f20a591b4b0fdf8d6848839d3f8ee95'
* commit 'fe3ad1913f20a591b4b0fdf8d6848839d3f8ee95':
doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.
2009-12-17 10:34:54 -08:00
Dirk Dougherty
fe3ad1913f
am 24780ea6: Merge change I75bb4c98 into eclair
...
Merge commit '24780ea60fab2c7fb399c88cd51151eccbbf383f' into eclair-plus-aosp
* commit '24780ea60fab2c7fb399c88cd51151eccbbf383f':
doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.
2009-12-17 10:33:23 -08:00
Dirk Dougherty
d283b09b8a
am 6fda019b: am 82e037a4: Merge change I3f67758f into eclair
...
Merge commit '6fda019bdcf9f9c172155aa2f2bb07afbe01fad9'
* commit '6fda019bdcf9f9c172155aa2f2bb07afbe01fad9':
doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
2009-12-17 10:33:16 -08:00
Android (Google) Code Review
24780ea60f
Merge change I75bb4c98 into eclair
...
* changes:
doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.
2009-12-17 10:31:19 -08:00
Dirk Dougherty
6fda019bdc
am 82e037a4: Merge change I3f67758f into eclair
...
Merge commit '82e037a4ed8ef38a4ca45e0058cf179111f1e98f' into eclair-plus-aosp
* commit '82e037a4ed8ef38a4ca45e0058cf179111f1e98f':
doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
2009-12-17 10:30:39 -08:00
Android (Google) Code Review
82e037a4ed
Merge change I3f67758f into eclair
...
* changes:
doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
2009-12-17 10:28:06 -08:00
Dirk Dougherty
9b5ea48871
doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.
...
Bug: 2315781
Change-Id: I75bb4c98fa48af47c935787a5ab30ca7c1a8091d
2009-12-17 10:15:23 -08:00
Dirk Dougherty
51ae620ce2
doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
...
Bug:2160782
Change-Id: I3f67758f207df0fdde8a46d40ba8d5873097e460
2009-12-17 10:07:46 -08:00
Scott Main
1362bbcf76
docs: update the Bluetooth guide with links to the sample
...
app, scrub the sibling files, and revise the Bluetooth package
summary to point to the BT dev guide.
2009-12-16 18:48:02 -08:00
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
