Dirk Dougherty
f93cf36964
am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
...
Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-plus-aosp
* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
doc change: misc doc fixes.
2009-11-02 18:27:55 -08:00
Dirk Dougherty
6b13bc043e
doc change: misc doc fixes.
...
Bug:2160782
Change-Id: Iaf5d2cc2e3c657700469e8b7394a95bc03fc26f3
2009-10-30 19:44:22 -07:00
Dirk Dougherty
c53793d206
am 524c4e72: am 9ac642a9: am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
...
Merge commit '524c4e720d3811230ef9f1707efa280f8f00b851'
* commit '524c4e720d3811230ef9f1707efa280f8f00b851':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-29 14:44:59 -07:00
Dirk Dougherty
524c4e720d
am 9ac642a9: am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
...
Merge commit '9ac642a924a85d26fb093a0c4aa0a20817927935' into eclair-mr2-plus-aosp
* commit '9ac642a924a85d26fb093a0c4aa0a20817927935':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-29 14:00:39 -07:00
Dirk Dougherty
b7e7b71065
am a292fefe: am 4c071f0d: am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
...
Merge commit 'a292fefeb77ed8e33afd7451090c3e21761fd266'
* commit 'a292fefeb77ed8e33afd7451090c3e21761fd266':
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-28 23:54:35 -07:00
Dirk Dougherty
a292fefeb7
am 4c071f0d: am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
...
Merge commit '4c071f0d69ac0e3eaf386797faeb52d63de30806' into eclair-mr2-plus-aosp
* commit '4c071f0d69ac0e3eaf386797faeb52d63de30806':
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-28 12:45:22 -07:00
Dirk Dougherty
cdf2c1bf26
am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
...
Merge commit '340fbc36fb5ded7819d09d55117917b9a6361fd4' into eclair-plus-aosp
* commit '340fbc36fb5ded7819d09d55117917b9a6361fd4':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-28 11:47:47 -07:00
Dirk Dougherty
00dc5756b1
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
...
Bug: 2160782
Change-Id: Ib80db9231f91a36f503db487982378b252c0fcd8
2009-10-27 18:58:54 -07:00
Dirk Dougherty
91eeda64b6
am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
...
Merge commit '59625fa86ad0e520931361aba120e2d868f01618' into eclair-plus-aosp
* commit '59625fa86ad0e520931361aba120e2d868f01618':
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-26 18:42:44 -07:00
Dirk Dougherty
bf15ce6de4
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
...
Bug:2160782
Change-Id: I020b31e10f2733223aa37d03687cf8a63843afa7
2009-10-26 18:19:22 -07:00
Dirk Dougherty
73d64fa200
am 3bf0210d: am f0d9c000: am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 into eclair-sdk
...
Merge commit '3bf0210dca67e534bf8d344575abf32e653c8407'
* commit '3bf0210dca67e534bf8d344575abf32e653c8407':
doc change: incorporate comments on SDK docs and structure.
2009-10-22 19:07:17 -07:00
Dirk Dougherty
8eef2dd945
Merge commit '9b7fb57c' into manualmerge
...
Conflicts:
docs/html/sdk/android-1.5.jd
2009-10-22 18:44:32 -07:00
Dirk Dougherty
3bf0210dca
am f0d9c000: am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 into eclair-sdk
...
Merge commit 'f0d9c0000858f3e48bcd1efec75f2dff1cbc6ed5' into eclair-mr2-plus-aosp
* commit 'f0d9c0000858f3e48bcd1efec75f2dff1cbc6ed5':
doc change: incorporate comments on SDK docs and structure.
2009-10-22 18:39:56 -07:00
Dirk Dougherty
26983c69fa
am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 into eclair-sdk
...
Merge commit '86dc4d312216be0b4c2847a1e79d94efaf4b9559' into eclair-plus-aosp
* commit '86dc4d312216be0b4c2847a1e79d94efaf4b9559':
doc change: incorporate comments on SDK docs and structure.
2009-10-22 18:13:49 -07:00
Dirk Dougherty
eeb0b2514a
doc change: incorporate comments on SDK docs and structure.
...
Bug: 2160782
2009-10-22 17:35:02 -07:00
Dirk Dougherty
4f983852fd
am 419264c2: am 875d235c: am e12191a7: am 439bf97c: doc change: edits to the screens support doc.
...
Merge commit '419264c22c8776274119e66349068f8c712b1c2f'
* commit '419264c22c8776274119e66349068f8c712b1c2f':
doc change: edits to the screens support doc.
2009-10-22 14:35:31 -07:00
Dirk Dougherty
256ca9b93c
am f80cd7bd: am 208e390a: am e5e2c167: am f4b5540b: doc change only: add screens support doc
...
Merge commit 'f80cd7bdc4e6c1c83afb19650e9177ec5e0d8d6f'
* commit 'f80cd7bdc4e6c1c83afb19650e9177ec5e0d8d6f':
doc change only: add screens support doc
2009-10-22 14:35:17 -07:00
Scott Main
3f3b61bd97
resolved conflicts for merge of 618ae454 to master
2009-10-22 14:29:35 -07:00
Dirk Dougherty
9b7fb57c6e
am 96f225af: am 4f82394a: am ee58d1bf: doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
...
Merge commit '96f225afad61ee701dd84348e380a40ff8900fc0' into eclair-mr2-plus-aosp
* commit '96f225afad61ee701dd84348e380a40ff8900fc0':
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
2009-10-22 13:42:49 -07:00
Dirk Dougherty
419264c22c
am 875d235c: am e12191a7: am 439bf97c: doc change: edits to the screens support doc.
...
Merge commit '875d235cf1c685597026997bae49ea820351b576' into eclair-mr2-plus-aosp
* commit '875d235cf1c685597026997bae49ea820351b576':
doc change: edits to the screens support doc.
2009-10-22 13:42:24 -07:00
Dirk Dougherty
f80cd7bdc4
am 208e390a: am e5e2c167: am f4b5540b: doc change only: add screens support doc
...
Merge commit '208e390af0ab1ca5f0cb2000692ea20cf67a9ea3' into eclair-mr2-plus-aosp
* commit '208e390af0ab1ca5f0cb2000692ea20cf67a9ea3':
doc change only: add screens support doc
2009-10-22 13:42:08 -07:00
Scott Main
618ae45494
am df3a7e79: am 3c0c0da9: am f90178d0: docs only. fix some typos.
...
Merge commit 'df3a7e797738587873f1269b2989c516ec302395' into eclair-mr2-plus-aosp
* commit 'df3a7e797738587873f1269b2989c516ec302395':
docs only.
2009-10-22 13:41:44 -07:00
Dirk Dougherty
07bdacfc61
am 4f82394a: am ee58d1bf: doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
...
Merge commit '4f82394af6486e1725ae6b6dd3b0334dcfc52747' into eclair-plus-aosp
* commit '4f82394af6486e1725ae6b6dd3b0334dcfc52747':
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
2009-10-22 13:32:31 -07:00
Dirk Dougherty
72da8a7400
am e12191a7: am 439bf97c: doc change: edits to the screens support doc.
...
Merge commit 'e12191a7ec9ab35e4ce80726be2734881a24a223' into eclair-plus-aosp
* commit 'e12191a7ec9ab35e4ce80726be2734881a24a223':
doc change: edits to the screens support doc.
2009-10-22 13:32:01 -07:00
Dirk Dougherty
f911374ff6
am e5e2c167: am f4b5540b: doc change only: add screens support doc
...
Merge commit 'e5e2c167366ff3823b4096af00b2a2ab2d0e6127' into eclair-plus-aosp
* commit 'e5e2c167366ff3823b4096af00b2a2ab2d0e6127':
doc change only: add screens support doc
2009-10-22 13:31:48 -07:00
Scott Main
59c7022365
am 3c0c0da9: am f90178d0: docs only. fix some typos.
...
Merge commit '3c0c0da95f23712fb926fc9edf4023528eabd868' into eclair-plus-aosp
* commit '3c0c0da95f23712fb926fc9edf4023528eabd868':
docs only.
2009-10-22 13:31:34 -07:00
Jeff Sharkey
5f23370d15
am 4d53dd40: am d7b1d3d4: am 9aa7e4e7: am d7bc6546: Fix spacing to escape "false" correctly.
...
Merge commit '4d53dd40ea5e433da419d0bddb0269a7acb2c268'
* commit '4d53dd40ea5e433da419d0bddb0269a7acb2c268':
Fix spacing to escape "false" correctly.
2009-10-22 09:50:46 -07:00
Jeff Sharkey
4d53dd40ea
am d7b1d3d4: am 9aa7e4e7: am d7bc6546: Fix spacing to escape "false" correctly.
...
Merge commit 'd7b1d3d4b4ff49a4b0872f8e39c71d8867527d63' into eclair-mr2-plus-aosp
* commit 'd7b1d3d4b4ff49a4b0872f8e39c71d8867527d63':
Fix spacing to escape "false" correctly.
2009-10-22 09:34:45 -07:00
Dirk Dougherty
ee58d1bf9c
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
...
Change-Id:I368345755dd753b1056fb06ff25e4b32f3020e4d
Bug:2160782
2009-10-22 00:59:47 -07:00
Dirk Dougherty
439bf97ca5
doc change: edits to the screens support doc.
...
Bug: 2160782
2009-10-21 18:33:12 -07:00
Dirk Dougherty
f4b5540b35
doc change only: add screens support doc
2009-10-21 18:32:24 -07:00
Scott Main
f90178d08d
docs only.
...
fix some typos.
2009-10-21 18:31:54 -07:00
Jeff Sharkey
9158be45af
am 9aa7e4e7: am d7bc6546: Fix spacing to escape "false" correctly.
...
Merge commit '9aa7e4e729b6f3c3075e762af37c259f84bfe876' into eclair-plus-aosp
* commit '9aa7e4e729b6f3c3075e762af37c259f84bfe876':
Fix spacing to escape "false" correctly.
2009-10-20 16:34:05 -07:00
Jeff Sharkey
d7bc654626
Fix spacing to escape "false" correctly.
2009-10-20 16:02:01 -07:00
Scott Main
f3bc5349b2
docs: fix doc error in dialog example snippet (no not merge)
...
bug: 2160782
2009-10-16 17:40:36 -07:00
Scott Main
108f5ac35d
am 0712f24d: am a486f554: am 7f66dbce: Merge change Ic37381fb into eclair
...
Merge commit '0712f24dbf14473cb55e5b609c3418610b77d406'
* commit '0712f24dbf14473cb55e5b609c3418610b77d406':
docs: fix doc error in dialog example snippet
2009-10-16 15:02:20 -07:00
Scott Main
0712f24dbf
am a486f554: am 7f66dbce: Merge change Ic37381fb into eclair
...
Merge commit 'a486f554aa494dfeea4d63fde0d533ea9e1cfe2f' into eclair-mr2-plus-aosp
* commit 'a486f554aa494dfeea4d63fde0d533ea9e1cfe2f':
docs: fix doc error in dialog example snippet
2009-10-16 14:44:05 -07:00
Scott Main
d8d7d53bd7
am 7f66dbce: Merge change Ic37381fb into eclair
...
Merge commit '7f66dbcec37bdb154db0e7c95c73ecd257bc38c9' into eclair-plus-aosp
* commit '7f66dbcec37bdb154db0e7c95c73ecd257bc38c9':
docs: fix doc error in dialog example snippet
2009-10-16 14:32:17 -07:00
Scott Main
c37381fbee
docs: fix doc error in dialog example snippet
...
bug: 2160782
2009-10-16 14:08:37 -07:00
Scott Main
fa69b60a86
am d5f5a009: am f18b9311: am 30a6657e: Merge change Ic9b31801 into eclair
...
Merge commit 'd5f5a0094559853b171ea97702e2d0477692226d'
* commit 'd5f5a0094559853b171ea97702e2d0477692226d':
docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0...
2009-10-14 18:16:44 -07:00
Scott Main
d5f5a00945
am f18b9311: am 30a6657e: Merge change Ic9b31801 into eclair
...
Merge commit 'f18b9311e8a6c4b05574727ae117338a9c341a1b' into eclair-mr2-plus-aosp
* commit 'f18b9311e8a6c4b05574727ae117338a9c341a1b':
docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0...
2009-10-14 18:11:31 -07:00
Scott Main
032f6598bf
am 30a6657e: Merge change Ic9b31801 into eclair
...
Merge commit '30a6657ec6051ba5a1c72a714c9dc535dff127a4' into eclair-plus-aosp
* commit '30a6657ec6051ba5a1c72a714c9dc535dff127a4':
docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0...
2009-10-14 18:01:59 -07:00
Android (Google) Code Review
30a6657ec6
Merge change Ic9b31801 into eclair
...
* changes:
docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0... move upgrading doc into a new guide for "updating" with the new manager tools and remove the previous updating doc from the dev guide. set up preliminary download page and guide for installing the full SDK. add the requirements doc in sdk/ for all general purposes. revise the download 'thank you' message.
2009-10-14 20:52:50 -04:00
Scott Main
efd83af0a7
docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0...
...
move upgrading doc into a new guide for "updating" with
the new manager tools and remove the previous updating doc
from the dev guide. set up preliminary download page and guide
for installing the full SDK. add the requirements doc in sdk/
for all general purposes. revise the download 'thank you'
message.
bug: 2160782
2009-10-14 17:44:13 -07:00
Katarina Stenstedt
9d13eec498
am e9b7d2f9: am d4fa96ea: am 399fc263: Merge change If30c5e20 into eclair
...
Merge commit 'e9b7d2f92479a51625d24425742be3d176a8c046'
* commit 'e9b7d2f92479a51625d24425742be3d176a8c046':
SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.
2009-10-14 11:08:11 -07:00
Katarina Stenstedt
e9b7d2f924
am d4fa96ea: am 399fc263: Merge change If30c5e20 into eclair
...
Merge commit 'd4fa96eab34c6141dc9ea832e727ad83e4f8b34d' into eclair-mr2-plus-aosp
* commit 'd4fa96eab34c6141dc9ea832e727ad83e4f8b34d':
SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.
2009-10-14 10:11:04 -07:00
Katarina Stenstedt
8b80c3e5c0
am 399fc263: Merge change If30c5e20 into eclair
...
Merge commit '399fc2636f1332986f319df3cf8ae56344070c51' into eclair-plus-aosp
* commit '399fc2636f1332986f319df3cf8ae56344070c51':
SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.
2009-10-14 10:08:42 -07:00
Katarina Stenstedt
d1f3d4e829
SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.
...
Changed image links to use @docRoot.
Change-id: If30c5e20bbbb0dd4a6eb0563ede2767d110e1c2e
Bug: 2158141
2009-10-12 16:17:42 -07:00
Scott Main
6a48fccce2
am dd964993: am f80e7d9c: am 60d8b780: Merge change 27064 into donut
...
Merge commit 'dd9649931fa2ce3a9fa469438cd81fc748355be0'
* commit 'dd9649931fa2ce3a9fa469438cd81fc748355be0':
docs only.
2009-09-27 15:43:20 -07:00
Scott Main
dd9649931f
am f80e7d9c: am 60d8b780: Merge change 27064 into donut
...
Merge commit 'f80e7d9cca1730506599ded8e32064e86b51344f' into eclair-plus-aosp
* commit 'f80e7d9cca1730506599ded8e32064e86b51344f':
docs only.
2009-09-25 18:03:11 -07:00
