1100 Commits

Author SHA1 Message Date
Dirk Dougherty
f6a04aeeed am f9c7a3e2: am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
Merge commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207'

* commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207':
  Doc change: update ADT 0.9.8 checksum and size.
2010-09-15 07:08:23 -07:00
Dirk Dougherty
f9c7a3e25e am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
Merge commit 'e71396cf4704ee9e26f510b511c1e793d8048d83' into gingerbread-plus-aosp

* commit 'e71396cf4704ee9e26f510b511c1e793d8048d83':
  Doc change: update ADT 0.9.8 checksum and size.
2010-09-14 09:46:44 -07:00
Dirk Dougherty
e71396cf47 am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
Merge commit '4b4af990af527c79073d546ead1850278caa7a8e' into gingerbread

* commit '4b4af990af527c79073d546ead1850278caa7a8e':
  Doc change: update ADT 0.9.8 checksum and size.
2010-09-14 09:39:59 -07:00
Dirk Dougherty
4b4af990af Doc change: update ADT 0.9.8 checksum and size.
Change-Id: I610985683cd4608b075a22e8d8089de7896eb312
2010-09-14 09:17:33 -07:00
Scott Main
8ca8ff106a am 4cf0f45d: am 3b202844: am 51c18989: docs: update platform dashboard
Merge commit '4cf0f45d6589d671be443471ea706bc7f299fbf1'

* commit '4cf0f45d6589d671be443471ea706bc7f299fbf1':
  docs: update platform dashboard
2010-09-10 14:51:23 -07:00
Joe Malin
2c1723ef56 Doc Change: add screenshots to Testing in Eclipse topic
Change-Id: If0ebd70ece3f077e18c909db2b8cc499a7f92692
2010-09-10 13:27:23 -07:00
Scott Main
4cf0f45d65 am 3b202844: am 51c18989: docs: update platform dashboard
Merge commit '3b202844fef5eb1a213bd7108dd1b6d42b1d9c64' into gingerbread-plus-aosp

* commit '3b202844fef5eb1a213bd7108dd1b6d42b1d9c64':
  docs: update platform dashboard
2010-09-10 12:39:57 -07:00
Scott Main
3b202844fe am 51c18989: docs: update platform dashboard
Merge commit '51c18989cf44d14a7ff82c45d9886b7ea55bd068' into gingerbread

* commit '51c18989cf44d14a7ff82c45d9886b7ea55bd068':
  docs: update platform dashboard
2010-09-10 12:34:06 -07:00
Scott Main
51c18989cf docs: update platform dashboard
Change-Id: Id4acf3ca425b278e534f83511fb10dfdbdceb03b
2010-09-10 11:46:17 -07:00
Dirk Dougherty
6245480ce9 am 621c6adc: am a71d6994: am 74a74d3c: Doc change: Fixes for toggle image and adt release date.
Merge commit '621c6adcb765ab348eb0daf770d4c0eca65fd632'

* commit '621c6adcb765ab348eb0daf770d4c0eca65fd632':
  Doc change: Fixes for toggle image and adt release date.
2010-09-09 19:05:39 -07:00
Dirk Dougherty
621c6adcb7 am a71d6994: am 74a74d3c: Doc change: Fixes for toggle image and adt release date.
Merge commit 'a71d69947d4a74730b17021b4c809d054d66c741' into gingerbread-plus-aosp

* commit 'a71d69947d4a74730b17021b4c809d054d66c741':
  Doc change: Fixes for toggle image and adt release date.
2010-09-09 18:59:57 -07:00
Dirk Dougherty
a71d69947d am 74a74d3c: Doc change: Fixes for toggle image and adt release date.
Merge commit '74a74d3c355ec4bfa09bf32d6dd877233af09d48' into gingerbread

* commit '74a74d3c355ec4bfa09bf32d6dd877233af09d48':
  Doc change: Fixes for toggle image and adt release date.
2010-09-09 18:53:36 -07:00
Dirk Dougherty
74a74d3c35 Doc change: Fixes for toggle image and adt release date.
Change-Id: I2e76a42650c3ab54e597340cd96e4f7b23fe5116
2010-09-09 18:40:13 -07:00
Gilles Debunne
a78eca95ff Merge "Progress Dialog documentation example uses onPrepareDialog" 2010-09-09 11:56:11 -07:00
Gilles Debunne
6e1df0e981 Progress Dialog documentation example uses onPrepareDialog
Change-Id: I7afebdb321e28d8e4b1687ba4f503bde7d6031a0
2010-09-09 09:21:53 -07:00
Dirk Dougherty
54ceb6e68e am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
Merge commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50'

* commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
2010-09-08 18:22:33 -07:00
Dirk Dougherty
eed5d17d78 am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
Merge commit 'ea68cab8a33d3169de33c7112000cd3dae233afe' into gingerbread-plus-aosp

* commit 'ea68cab8a33d3169de33c7112000cd3dae233afe':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
2010-09-08 18:14:04 -07:00
Dirk Dougherty
ea68cab8a3 am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread

* commit '3eb07ea483225974484c018d7d5affbf4815ceb2':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
2010-09-08 18:05:58 -07:00
Dirk Dougherty
3eb07ea483 Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 2010-09-08 17:52:45 -07:00
Dirk Dougherty
022171be9d Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
Change-Id: I7cc8301e0160acd0adb3efbd20c6515ed985684f
2010-09-08 15:59:56 -07:00
Elliott Hughes
da2d18a055 am c50a4f37: am 45cda90b: Merge "Be brief." into gingerbread
Merge commit 'c50a4f374adbdfe75621928fb3eb3583e4ff4e77'

* commit 'c50a4f374adbdfe75621928fb3eb3583e4ff4e77':
  Be brief.
2010-09-07 18:51:16 -07:00
Elliott Hughes
c50a4f374a am 45cda90b: Merge "Be brief." into gingerbread
Merge commit '45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp

* commit '45cda90bdc178e253049c7067c78bf4b1204ba82':
  Be brief.
2010-09-07 14:46:15 -07:00
Elliott Hughes
45cda90bdc Merge "Be brief." into gingerbread 2010-09-07 14:41:36 -07:00
Scott Main
8ae409f501 am bfbf84b7: am 2b136832: am c4367e54: fix code snippet error
Merge commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb'

* commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb':
  fix code snippet error
2010-09-03 13:28:18 -07:00
Scott Main
bfbf84b726 am 2b136832: am c4367e54: fix code snippet error
Merge commit '2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp

* commit '2b136832be7326caed0c79bae418c2dd54372bea':
  fix code snippet error
2010-09-03 13:18:28 -07:00
Scott Main
2b136832be am c4367e54: fix code snippet error
Merge commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3' into gingerbread

* commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3':
  fix code snippet error
2010-09-03 13:15:11 -07:00
Scott Main
c4367e54e4 fix code snippet error
Change-Id: Ida2f5ac2bc0bfb9b13b142f6422dd4b815603ab5
2010-09-03 11:03:42 -07:00
Scott Main
b433298530 am beccf3c4: am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c'

* commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c':
  clarify dp dimension description
2010-09-02 18:53:32 -07:00
Scott Main
beccf3c48a am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit '3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp

* commit '3208557edca8c133fa32b7718acd22d77f1a9475':
  clarify dp dimension description
2010-09-02 18:44:11 -07:00
Scott Main
3208557edc am c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879' into gingerbread

* commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879':
  clarify dp dimension description
2010-09-02 18:30:16 -07:00
Scott Main
c5083cdfff Merge "clarify dp dimension description" into froyo 2010-09-02 17:53:14 -07:00
Joe Malin
3e3fcf985f Testing Documentation in the Dev Guide tab
Change-Id: I36cb020642a7f094d2070509abb280c7c88f607f
2010-08-27 17:59:38 -07:00
Brad Fitzpatrick
4dcea37d48 am e339c096: am 9020595b: am f5287094: Fix closing tag in docs.
Merge commit 'e339c0968e781f28e0c690afc746ea3d16aba146'

* commit 'e339c0968e781f28e0c690afc746ea3d16aba146':
  Fix closing tag in docs.
2010-08-27 16:18:03 -07:00
Brad Fitzpatrick
e339c0968e am 9020595b: am f5287094: Fix closing tag in docs.
Merge commit '9020595b7f376bb414c9a6dba216dec76ababb17' into gingerbread-plus-aosp

* commit '9020595b7f376bb414c9a6dba216dec76ababb17':
  Fix closing tag in docs.
2010-08-27 12:23:30 -07:00
Brad Fitzpatrick
9020595b7f am f5287094: Fix closing tag in docs.
Merge commit 'f52870948d5d57d033fcdafc9c3fb0a872975447' into gingerbread

* commit 'f52870948d5d57d033fcdafc9c3fb0a872975447':
  Fix closing tag in docs.
2010-08-27 11:35:53 -07:00
Brad Fitzpatrick
f52870948d Fix closing tag in docs.
BUG=2956223

Change-Id: I0772d0b5386a783762319064c13d567c124da394
2010-08-27 11:22:50 -07:00
Gilles Debunne
aea2d763a2 Fix in fundamentals web page.
Change-Id: I330ea9c925315bc817bf544992401cd1957c1c2a
2010-08-25 10:31:57 -07:00
Joe Malin
edb6566e62 Merge "Image for Ia41a33d935ead704c1de439a0cfb0a55806cfe12" 2010-08-24 18:07:33 -07:00
Dirk Dougherty
91047d3b2c am 976b71e2: am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd'

* commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-24 11:54:39 -07:00
Scott Main
9ac16d2dc4 am 32b07fc6: am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit '32b07fc6cab290466c010d05667940a9ba5672e2'

* commit '32b07fc6cab290466c010d05667940a9ba5672e2':
  docs: add dev guide for getting user location
2010-08-24 11:21:04 -07:00
Dirk Dougherty
976b71e2e0 am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp

* commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-23 17:52:41 -07:00
Dirk Dougherty
afdc85f65d am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit '397c0f5a18281e3880b9359feab683a13d271a03' into gingerbread

* commit '397c0f5a18281e3880b9359feab683a13d271a03':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-23 17:49:49 -07:00
Dirk Dougherty
397c0f5a18 Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo 2010-08-23 17:40:46 -07:00
Dirk Dougherty
1ba62882e4 Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Change-Id: I9e04c54ed3e4d10afddedd6e6e35761e67652cd8
2010-08-23 17:38:35 -07:00
Scott Main
32b07fc6ca am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9' into gingerbread-plus-aosp

* commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9':
  docs: add dev guide for getting user location
2010-08-23 12:44:18 -07:00
Scott Main
e7aa645a1a am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit '5a98fef352ed835406fa74a5563eadd9708f7cf9' into gingerbread

* commit '5a98fef352ed835406fa74a5563eadd9708f7cf9':
  docs: add dev guide for getting user location
2010-08-23 12:41:45 -07:00
Scott Main
385a655b8e am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f'

* commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f':
  docs: add links from widget classes to tutorials
2010-08-21 09:44:53 -07:00
Scott Main
fa4596ec80 docs: add dev guide for getting user location
Change-Id: I63558c0304a632ccfbb7a80411ab23ad2c82b5c9
2010-08-20 14:21:26 -07:00
Scott Main
bb8d314b6c am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit '70c9ffbc838271f0ea27a4780eb146287de53ef6' into gingerbread-plus-aosp

* commit '70c9ffbc838271f0ea27a4780eb146287de53ef6':
  docs: add links from widget classes to tutorials
2010-08-19 17:40:10 -07:00
Scott Main
70c9ffbc83 am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit '11a72482a0cdc45ceaf4ca83957e682381455aee' into gingerbread

* commit '11a72482a0cdc45ceaf4ca83957e682381455aee':
  docs: add links from widget classes to tutorials
2010-08-19 17:37:31 -07:00