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

1074 Commits

Author SHA1 Message Date
Bill Napier
297bb68d7c Merge "Fix up some issues with the onCreateContextMenu example in the Notepad tutorial." 2010-09-23 16:17:11 -07:00
Dirk Dougherty
8cb9e9c5c7 am 85662b8e: am f356c4bb: Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread 
Merge commit '85662b8e4f69b0e6d9a04084d4e2354fb8eecad5'

* commit '85662b8e4f69b0e6d9a04084d4e2354fb8eecad5':
  Doc change: ADT 0.9.9 version notes, size/sum update.
 2010-09-23 15:04:43 -07:00
Dirk Dougherty
85662b8e4f am f356c4bb: Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread 
Merge commit 'f356c4bb3b19786555ceed8a1dbc824aac742d1b' into gingerbread-plus-aosp

* commit 'f356c4bb3b19786555ceed8a1dbc824aac742d1b':
  Doc change: ADT 0.9.9 version notes, size/sum update.
 2010-09-23 15:00:59 -07:00
Dirk Dougherty
f356c4bb3b Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread 2010-09-23 14:58:41 -07:00
Scott Main
35a840c8b1 am a2427797: am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 
Merge commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2'

* commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2':
  docs: add more info about state list drawable and onclick attribute to Button
 2010-09-23 13:10:22 -07:00
Dirk Dougherty
9a97aaf72b Doc change: ADT 0.9.9 version notes, size/sum update. 
Change-Id: I824da2911e782b0eec1e684a1982750ac308977b
 2010-09-23 11:48:54 -07:00
Scott Main
a24277977d am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 
Merge commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95' into gingerbread-plus-aosp

* commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95':
  docs: add more info about state list drawable and onclick attribute to Button
 2010-09-23 11:46:10 -07:00
Scott Main
2dc43f3d4c am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 
Merge commit '5b7328f257a76ff6b7b60872d6a106002ff1f679' into gingerbread

* commit '5b7328f257a76ff6b7b60872d6a106002ff1f679':
  docs: add more info about state list drawable and onclick attribute to Button
 2010-09-23 11:41:48 -07:00
Scott Main
5b7328f257 Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 2010-09-23 11:23:48 -07:00
Dirk Dougherty
27de3a240f Doc change: ADT 0.9.9 version notes, size/sum update. 
Change-Id: I08ebfa95b0735964a888a89931a1f4c3bdf1862c
 2010-09-23 10:25:24 -07:00
Scott Main
6ec3d4f0dc docs: add more info about state list drawable and onclick attribute to Button 
bug:1062898

Change-Id: I633c38fc20a2ebf894237f86648cc0fdc9488b1a
 2010-09-22 18:55:31 -07:00
Joe Malin
0b7a3bc3de Merge "Doc Change: add screenshots to Testing in Eclipse topic" 2010-09-17 12:43:06 -07:00
Joe Onorato
9316232130 Fix broken javadoc. 
Change-Id: I4729ebee36117f281af613e0b49f70d7dee5f334
 2010-09-16 16:01:53 -04:00
Dirk Dougherty
40da25a26e am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread 
Merge commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6'

* commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6':
  Doc change: clean up droiddoc (cs) macros.
 2010-09-16 11:32:30 -07:00
Joe Onorato
04065bdcca am ee76ed9c: am 4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread 
Merge commit 'ee76ed9c0df11ac70ae67bae051cb64c9d79dafb'

* commit 'ee76ed9c0df11ac70ae67bae051cb64c9d79dafb':
  Fix the rest of the javadoc warnings.
 2010-09-16 11:32:12 -07:00
Dirk Dougherty
8ee9ecc145 am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread 
Merge commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453' into gingerbread-plus-aosp

* commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453':
  Doc change: clean up droiddoc (cs) macros.
 2010-09-16 11:19:54 -07:00
Dirk Dougherty
9afd90939b Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread 2010-09-16 11:16:29 -07:00
Dirk Dougherty
9519eab313 Doc change: clean up droiddoc (cs) macros. 
Change-Id: I84b08a573fea42686a41ff694f1a52e8fb760dc5
 2010-09-16 11:08:57 -07:00
Joe Onorato
ee76ed9c0d am 4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread 
Merge commit '4198cececf70bf034e12f19bb87f29cc29931c39' into gingerbread-plus-aosp

* commit '4198cececf70bf034e12f19bb87f29cc29931c39':
  Fix the rest of the javadoc warnings.
 2010-09-16 10:41:54 -07:00
Joe Onorato
d3ad696b1d Fix the rest of the javadoc warnings. 
Change-Id: Ifbf422a2eb177858813d118f03ceddcd807e73b4
 2010-09-16 13:38:25 -04:00
Joe Onorato
d20e5d0a29 DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags. 
Change-Id: Ifa46210d1e590e5298376539b6099452d85ef93d
 2010-09-16 12:38:42 -04:00
Joe Onorato
f8a93cb7b9 am 8c9eacd9: Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread 
Merge commit '8c9eacd9b9669642b052e3349d55c6a303f54b31' into gingerbread-plus-aosp

* commit '8c9eacd9b9669642b052e3349d55c6a303f54b31':
  DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.
 2010-09-16 09:27:56 -07:00
Joe Onorato
71f7f67230 DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags. 
Change-Id: I4a04d9b182f2e644eb8d1966c33a0d280bf203e6
 2010-09-16 12:03:41 -04:00
Bill Napier
8b0b7af010 Fix up some issues with the onCreateContextMenu example in the Notepad tutorial. 
Change-Id: I8e9329d3b9da507effafb886a33a0a7e6574a7c7
 2010-09-15 14:37:58 -07:00
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