summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* Testing Documentation in the Dev Guide tabJoe Malin2010-08-2712-1068/+2179
| | | | Change-Id: I36cb020642a7f094d2070509abb280c7c88f607f
* am e339c096: am 9020595b: am f5287094: Fix closing tag in docs.Brad Fitzpatrick2010-08-271-1/+1
|\ | | | | | | | | | | | | Merge commit 'e339c0968e781f28e0c690afc746ea3d16aba146' * commit 'e339c0968e781f28e0c690afc746ea3d16aba146': Fix closing tag in docs.
| * am 9020595b: am f5287094: Fix closing tag in docs.Brad Fitzpatrick2010-08-271-1/+1
| |\ | | | | | | | | | | | | | | | | | | Merge commit '9020595b7f376bb414c9a6dba216dec76ababb17' into gingerbread-plus-aosp * commit '9020595b7f376bb414c9a6dba216dec76ababb17': Fix closing tag in docs.
| | * am f5287094: Fix closing tag in docs.Brad Fitzpatrick2010-08-271-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f52870948d5d57d033fcdafc9c3fb0a872975447' into gingerbread * commit 'f52870948d5d57d033fcdafc9c3fb0a872975447': Fix closing tag in docs.
| | | * Fix closing tag in docs.Brad Fitzpatrick2010-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | BUG=2956223 Change-Id: I0772d0b5386a783762319064c13d567c124da394
* | | | Fix in fundamentals web page.Gilles Debunne2010-08-251-6/+6
| | | | | | | | | | | | | | | | Change-Id: I330ea9c925315bc817bf544992401cd1957c1c2a
* | | | Merge "Image for Ia41a33d935ead704c1de439a0cfb0a55806cfe12"Joe Malin2010-08-241-0/+0
|\ \ \ \
| * | | | Image for Ia41a33d935ead704c1de439a0cfb0a55806cfe12Joe Malin2010-07-301-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2f18641c8c18e2ca48d85c3231d50bc95dd74c0e
* | | | | am 976b71e2: am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to ↵Dirk Dougherty2010-08-242-37/+91
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch ↵Dirk Dougherty2010-08-232-37/+91
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and ↵Dirk Dougherty2010-08-232-37/+91
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | Merge "Doc change: Add table to clarify launch modes and caution against ↵Dirk Dougherty2010-08-232-37/+91
| | | |\ \ | | | | | | | | | | | | | | | | | | using SingleTask and SingleInstance modes." into froyo
| | | | * | Doc change: Add table to clarify launch modes and caution against using ↵Dirk Dougherty2010-08-232-37/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SingleTask and SingleInstance modes. Change-Id: I9e04c54ed3e4d10afddedd6e6e35761e67652cd8
* | | | | | am 32b07fc6: am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for ↵Scott Main2010-08-246-72/+502
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getting user location" into froyo Merge commit '32b07fc6cab290466c010d05667940a9ba5672e2' * commit '32b07fc6cab290466c010d05667940a9ba5672e2': docs: add dev guide for getting user location
| * | | | | am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user ↵Scott Main2010-08-236-72/+502
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | location" into froyo Merge commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9' into gingerbread-plus-aosp * commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9': docs: add dev guide for getting user location
| | * | | | am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyoScott Main2010-08-236-72/+502
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5a98fef352ed835406fa74a5563eadd9708f7cf9' into gingerbread * commit '5a98fef352ed835406fa74a5563eadd9708f7cf9': docs: add dev guide for getting user location
| | | * | | docs: add dev guide for getting user locationScott Main2010-08-206-72/+502
| | | |/ / | | | | | | | | | | | | | | | Change-Id: I63558c0304a632ccfbb7a80411ab23ad2c82b5c9
* | | | | am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget ↵Scott Main2010-08-211-6/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | classes to tutorials" into froyo Merge commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f' * commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f': docs: add links from widget classes to tutorials
| * | | | am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to ↵Scott Main2010-08-191-6/+20
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tutorials" into froyo Merge commit '70c9ffbc838271f0ea27a4780eb146287de53ef6' into gingerbread-plus-aosp * commit '70c9ffbc838271f0ea27a4780eb146287de53ef6': docs: add links from widget classes to tutorials
| | * | | am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyoScott Main2010-08-191-6/+20
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '11a72482a0cdc45ceaf4ca83957e682381455aee' into gingerbread * commit '11a72482a0cdc45ceaf4ca83957e682381455aee': docs: add links from widget classes to tutorials
| | | * | docs: add links from widget classes to tutorialsScott Main2010-08-191-6/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: I817e885524951853182b0458df4a32dea1614243
* | | | | am 1ef758b8: am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for ↵Trevor Johns2010-08-121-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Developer Forums doc." into froyo Merge commit '1ef758b817ba225dbb9005b6def7d8d47ccdfe15' * commit '1ef758b817ba225dbb9005b6def7d8d47ccdfe15': Fix subscribe links for Developer Forums doc.
| * | | | am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums ↵Trevor Johns2010-08-121-5/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc." into froyo Merge commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60' into gingerbread-plus-aosp * commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60': Fix subscribe links for Developer Forums doc.
| | * | | am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyoTrevor Johns2010-08-121-5/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795' into gingerbread * commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795': Fix subscribe links for Developer Forums doc.
| | | * | Fix subscribe links for Developer Forums doc.Trevor Johns2010-08-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The email-based subscribe links for the Android Developer forums do not work for two groups (android-discuss, android-beginners) due to recent changes in those groups. These links need to be changed to HTML-based subscribe links instead. For consistency, other links are being changed to use the HTML-based subscription mechanism as well. Internal Bug: 2908002 Change-Id: I601b959935584270d6107c4600b28ac5f51359e1
* | | | | am c9de8c34: am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; ↵Scott Main2010-08-053-3/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add link to resource docs for ColorStateList class Merge commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8' * commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8': fix some doc errors in the resources;
| * | | | am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to ↵Scott Main2010-08-043-3/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resource docs for ColorStateList class Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp * commit '97c2d840a10813164d82571775a3566637d6c5de': fix some doc errors in the resources;
| | * | | am 8dd87ad9: fix some doc errors in the resources; add link to resource docs ↵Scott Main2010-08-043-3/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for ColorStateList class Merge commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41' into gingerbread * commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41': fix some doc errors in the resources;
| | | * | fix some doc errors in the resources;Scott Main2010-08-043-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add link to resource docs for ColorStateList class Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502
* | | | | am fa32a45a: am f2d16bc5: am 5aa4680e: update device dashboardScott Main2010-08-032-31/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fa32a45af724f675215bff920dd264be4a9aae24' * commit 'fa32a45af724f675215bff920dd264be4a9aae24': update device dashboard
| * | | | am f2d16bc5: am 5aa4680e: update device dashboardScott Main2010-08-022-31/+31
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb' into gingerbread-plus-aosp * commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb': update device dashboard
| | * | | am 5aa4680e: update device dashboardScott Main2010-08-022-31/+31
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d' into gingerbread * commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d': update device dashboard
| | | * | update device dashboardScott Main2010-08-022-31/+31
| | | | | | | | | | | | | | | | | | | | Change-Id: I79ebf6fa740e19f32d724e9b8a387f2a143fdf7a
* | | | | am 77a66069: am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to ↵Scott Main2010-08-021-6/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dev phones." into froyo Merge commit '77a66069eb8fa0b99d090effa1d71b1fec992bdd' * commit '77a66069eb8fa0b99d090effa1d71b1fec992bdd': Doc change: Add nexus one to dev phones.
| * | | | am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." ↵Scott Main2010-08-021-6/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp * commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368': Doc change: Add nexus one to dev phones.
| | * | | am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyoScott Main2010-08-021-6/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread * commit '9cd797902ec8404c5958214fc078d75e87248bf3': Doc change: Add nexus one to dev phones.
| | | * | Merge "Doc change: Add nexus one to dev phones." into froyoScott Main2010-08-021-6/+5
| | | |\ \
| | | | * | Doc change: Add nexus one to dev phones.Dirk Dougherty2010-07-231-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I45d0207bff857db7355da6b7736d6a6a729a878a
* | | | | | am bd502940: am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc.Dirk Dougherty2010-07-311-94/+97
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | | | | | Merge commit 'bd5029403e0f9d93086604df6dbb1b989e58e964' * commit 'bd5029403e0f9d93086604df6dbb1b989e58e964': Doc change: Cleanup for licensing doc.
| * | | | am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc.Dirk Dougherty2010-07-301-94/+97
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '483b20e5ae65495d841de1844d97d79fbc0c1866' into gingerbread-plus-aosp * commit '483b20e5ae65495d841de1844d97d79fbc0c1866': Doc change: Cleanup for licensing doc.
| | * | | am 2ff1ba01: Doc change: Cleanup for licensing doc.Dirk Dougherty2010-07-301-94/+97
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread * commit '2ff1ba012c59169c9719cfab4516b9149414380b': Doc change: Cleanup for licensing doc.
| | | * | Doc change: Cleanup for licensing doc.Dirk Dougherty2010-07-301-94/+97
| | | | | | | | | | | | | | | | | | | | Change-Id: Iff046768d70adf0489f5241212061045cef2572f
| * | | | am 4609b0a8: am 3d8d9440: Merge "Fixes regarding densities in "Providing ↵Gilles Debunne2010-07-301-6/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resources" documentation page." into froyo Merge commit '4609b0a8fcfbed9b893301232dfa3b70bb30e4e2' into gingerbread-plus-aosp * commit '4609b0a8fcfbed9b893301232dfa3b70bb30e4e2': Fixes regarding densities in "Providing Resources" documentation page.
| | * | | am 3d8d9440: Merge "Fixes regarding densities in "Providing Resources" ↵Gilles Debunne2010-07-301-6/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation page." into froyo Merge commit '3d8d9440d844816f065d2b10eb75bb693683cdad' into gingerbread * commit '3d8d9440d844816f065d2b10eb75bb693683cdad': Fixes regarding densities in "Providing Resources" documentation page.
| | | * | Fixes regarding densities in "Providing Resources" documentation page.Gilles Debunne2010-07-291-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ratio between densities is not constant. The Exception for dpi qualifier in point 4 of the algorithm should be detailed. I understand that if my config is ldpi-trackball-v5 and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen. Cherry-picked from master CL 59188. Change-Id: Ibe412a82845527ebdb104605c99c205ca52ab97c
* | | | | am 0f0b7160: am e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)"Romain Guy2010-07-291-15/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0f0b71600b658c2c1a5cac63cb402f9ea443cb30' * commit '0f0b71600b658c2c1a5cac63cb402f9ea443cb30': Fixed a documentation Bug (Issue 9236)
| * | | | am e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)"Romain Guy2010-07-291-15/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5' into gingerbread-plus-aosp * commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5': Fixed a documentation Bug (Issue 9236)
| | * \ \ \ Merge "Fixed a documentation Bug (Issue 9236)"Romain Guy2010-07-291-15/+15
| | |\ \ \ \
| | | * | | | Fixed a documentation Bug (Issue 9236)Christian Mehlmauer2010-06-251-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I898b352f2b2f6b059ccd4a44c30e61c9dfdab9ec http://code.google.com/p/android/issues/detail?id=9236
* | | | | | | Merge "Fixes regarding densities in "Providing Resources" documentation page."Gilles Debunne2010-07-281-6/+5
|\ \ \ \ \ \ \