summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of f0b3fa60 to masterScott Main2010-10-253-74/+73
|\ | | | | | | Change-Id: Id15a8976a60548d50671d1c7af641302fce2f3d5
| * am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from ↵Scott Main2010-10-253-76/+72
| |\ | | | | | | | | | | | | | | | | | | | | | | | | SDK and Resources nav items Merge commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp * commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4': update featured videos
| | * am c9ac1079: update featured videos also remove "new" tags from SDK and ↵Scott Main2010-10-253-76/+72
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resources nav items Merge commit 'c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread * commit 'c9ac1079696b93a294f504c6561397ef731a46f9': update featured videos
| | | * update featured videosScott Main2010-10-253-76/+72
| | | | | | | | | | | | | | | | | | | | | | | | also remove "new" tags from SDK and Resources nav items Change-Id: I75e16fc6dda5a7cbcd4ff8e4ebb2189860e884d5
* | | | am 96bdc500: am 5016df1c: Merge "Doc Change: Revert NotePad sample test ↵Joe Malin2010-10-253-15/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | package" into gingerbread Merge commit '96bdc500104c3e162495a9bfcf90799467e45c3d' * commit '96bdc500104c3e162495a9bfcf90799467e45c3d': Doc Change: Revert NotePad sample test package
| * | | am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into ↵Joe Malin2010-10-253-15/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp * commit '5016df1cface59b04ad59d0fef29ea32dcad8d60': Doc Change: Revert NotePad sample test package
| | * | Doc Change: Revert NotePad sample test packageJoe Malin2010-10-253-15/+1
| | | | | | | | | | | | | | | | Change-Id: I68a1b6f9cd64a86c5a8fa6657559f47a89162b37
* | | | am b619e333: am 218bf884: am a6df4b1b: docs: add note to froyo platform doc ↵Scott Main2010-10-211-4/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | that not all locales are included in the sdk image Merge commit 'b619e3332d36a8b5c56da6530834be8cc69272df' * commit 'b619e3332d36a8b5c56da6530834be8cc69272df': docs: add note to froyo platform doc that not all locales are included in the sdk image
| * | | am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all ↵Scott Main2010-10-191-4/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | locales are included in the sdk image Merge commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0' into gingerbread-plus-aosp * commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0': docs: add note to froyo platform doc that not all locales are included in the sdk image
| | * | am a6df4b1b: docs: add note to froyo platform doc that not all locales are ↵Scott Main2010-10-191-4/+9
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | included in the sdk image Merge commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722' into gingerbread * commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722': docs: add note to froyo platform doc that not all locales are included in the sdk image
| | | * docs: add note to froyo platform doc that not all locales are included in ↵Scott Main2010-10-191-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | the sdk image Change-Id: Icf11a14e0db6eeff535ca51de7a664a4829a35ec
* | | | am 81df9841: am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev ↵Scott Main2010-10-171-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | guide link in package description" into froyo Merge commit '81df9841c64e417fe2adfab0e8d694af09e07c0d' * commit '81df9841c64e417fe2adfab0e8d694af09e07c0d': docs: fix typo; surface dev guide link in package description
| * | | am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in ↵Scott Main2010-10-151-3/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | package description" into froyo Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp * commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b': docs: fix typo; surface dev guide link in package description
| | * | am fda5b19c: Merge "docs: fix typo; surface dev guide link in package ↵Scott Main2010-10-151-3/+3
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | description" into froyo Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread * commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c': docs: fix typo; surface dev guide link in package description
| | | * Merge "docs: fix typo; surface dev guide link in package description" into froyoScott Main2010-10-151-3/+3
| | | |\
| | | | * docs: fix typo; surface dev guide link in package descriptionScott Main2010-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I2dc09bb6b79cbe3f80819d6193eb0d8a3565310d
* | | | | am b2bd4700: am 7f3addf3: am 09da9609: docs: fix code snippet errorsScott Main2010-10-171-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b2bd470010279fe45e2848aa8cd0b3ad6f6ca800' * commit 'b2bd470010279fe45e2848aa8cd0b3ad6f6ca800': docs: fix code snippet errors
| * | | | am 7f3addf3: am 09da9609: docs: fix code snippet errorsScott Main2010-10-151-4/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb' into gingerbread-plus-aosp * commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb': docs: fix code snippet errors
| | * | | am 09da9609: docs: fix code snippet errorsScott Main2010-10-151-4/+4
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '09da96099917141f2b90d53f61baa822bdd434d7' into gingerbread * commit '09da96099917141f2b90d53f61baa822bdd434d7': docs: fix code snippet errors
| | | * | docs: fix code snippet errorsScott Main2010-10-151-4/+4
| | | |/ | | | | | | | | | | | | Change-Id: Ie0ef6d4e642b6f9a68bdadd3e507f9fe2dd323d9
* | | | am 6bc34da8: am 612ebb92: Revert "Update the documentation for content ↵Nick Kralevich2010-10-161-13/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | provider security." Merge commit '6bc34da8acf26c8e70325719fe43eaf22489809d' * commit '6bc34da8acf26c8e70325719fe43eaf22489809d': Revert "Update the documentation for content provider security."
| * | | am 612ebb92: Revert "Update the documentation for content provider security."Nick Kralevich2010-10-151-13/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '612ebb9257e2adf982ed846fa43251c3754361f7' into gingerbread-plus-aosp * commit '612ebb9257e2adf982ed846fa43251c3754361f7': Revert "Update the documentation for content provider security."
| | * | Revert "Update the documentation for content provider security."Nick Kralevich2010-10-151-13/+4
| | | | | | | | | | | | | | | | This reverts commit 4fe4d4c91cdfa59bb8161625be85252e187667a2.
* | | | am 86052a87: am 66f1c459: Merge "Update the documentation for content ↵Nick Kralevich2010-10-161-4/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | provider security." into gingerbread Merge commit '86052a87409e7ceac654ffebbb9bcfce1597c5d8' * commit '86052a87409e7ceac654ffebbb9bcfce1597c5d8': Update the documentation for content provider security.
| * | | am 66f1c459: Merge "Update the documentation for content provider security." ↵Nick Kralevich2010-10-151-4/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '66f1c459ac15d1dba1850cb30759500d35078f29' into gingerbread-plus-aosp * commit '66f1c459ac15d1dba1850cb30759500d35078f29': Update the documentation for content provider security.
| | * | Merge "Update the documentation for content provider security." into gingerbreadNick Kralevich2010-10-151-4/+13
| | |\ \
| | | * | Update the documentation for content provider security.Chris Palmer2010-10-121-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this documentation fix, developers will not know that apps on pre-Gingercomb devices will inadvertantly export their content providers. With knowledge of the solid workaround, they can make their apps secure. Change-Id: I1f096aff19500cd3d3fd2955a9dec59d8e7c6a73
* | | | | am 439444d9: am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into ↵Joe Malin2010-10-151-11/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '439444d9043c46669d2fe8694ed3db8f09d92282' * commit '439444d9043c46669d2fe8694ed3db8f09d92282': DOC CHANGE: Fix bug in Testing doc
| * | | | am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbreadJoe Malin2010-10-141-11/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '75d3591b2dd60e50182542045147b9b6033c2b85' into gingerbread-plus-aosp * commit '75d3591b2dd60e50182542045147b9b6033c2b85': DOC CHANGE: Fix bug in Testing doc
| | * | | Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbreadJoe Malin2010-10-141-11/+7
| | |\ \ \
| | | * | | DOC CHANGE: Fix bug in Testing docJoe Malin2010-10-121-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id432a40adfb6aef05a3e7c19425de54cb8a5f610
* | | | | | am 5cfa877e: am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast ↵Scott Main2010-10-151-1/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to list of DO NOTs for installing on external storage bug: 3088494 Merge commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e' * commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e': docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
| * | | | | am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast to list of DO ↵Scott Main2010-10-131-1/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTs for installing on external storage bug: 3088494 Merge commit 'eb4ef07223030eb61d8cf99771e657b7fc0108d0' into gingerbread-plus-aosp * commit 'eb4ef07223030eb61d8cf99771e657b7fc0108d0': docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
| | * | | | am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for ↵Scott Main2010-10-131-1/+5
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | installing on external storage bug: 3088494 Merge commit '5249ad03454301744374d04e04b38aaad3b01530' into gingerbread * commit '5249ad03454301744374d04e04b38aaad3b01530': docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
| | | * | docs: add "boot completed" broadcast to list of DO NOTs for installing on ↵Scott Main2010-10-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external storage bug: 3088494 Change-Id: I9da318efb3d05d52eb8c2677e96da1bcf1cd542a
| | | * | Revert "docs: new web apps dev guides" Do not merge.Scott Main2010-10-1111-1021/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 65e62f4f908394fc469cf535fef7c16035a428a2. Conflicts: docs/html/guide/guide_toc.cs Change-Id: If6eb679a629bd4376043b2f49b6a82eacf71603d
* | | | | Doc change: Merge commit 'd555e264' into manualmergeDirk Dougherty2010-10-131-6/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/html/guide/guide_toc.cs Change-Id: I473bc026fe24caf6a851e8f282b1874c75ef5a30
| * | | | am 354954a0: Merge "Doc change: cherrypick testing changes from master. ↵Dirk Dougherty2010-10-1214-978/+2272
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following:" into gingerbread Merge commit '354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp * commit '354954a01c533c6789536c141cf330ddf3976e8b': Doc change: cherrypick testing changes from master. Squashed commit of the following:
| | * | | Merge "Doc change: cherrypick testing changes from master. Squashed commit ↵Dirk Dougherty2010-10-1214-978/+2272
| | |\ \ \ | | | | | | | | | | | | | | | | | | of the following:" into gingerbread
| | | * | | Doc change: cherrypick testing changes from master. Squashed commit of the ↵Dirk Dougherty2010-10-1014-978/+2272
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | following: commit 3341f42f857058707c1c9f77dcfaecb22ff2f125 Author: Joe Malin <jmalin@google.com> Date: Wed Sep 1 14:43:24 2010 -0700 Doc Change: cherrypick from master -- add screenshots to Testing in Eclipse topic Change-Id: If0ebd70ece3f077e18c909db2b8cc499a7f92692 commit af2da09a6c69cac02fd1987a44d223d678b2484d Author: Dirk Dougherty <ddougherty@google.com> Date: Sun Oct 10 12:39:55 2010 -0700 Doc change: Cherrypick from master -- Testing Documentation in the Dev Guide tab Conflicts: docs/html/guide/guide_toc.cs docs/html/guide/topics/testing/testing_android.jd Change-Id: I6d2e7b7f69517e8aae3a1274596d2ecbd85cac50 Change-Id: Ic6e547ce25c35060ec073b9da75e1d71b4946a85
* | | | | am 4711d21a: am 9facd2d0: Merge "StrictMode: link to designing for ↵Brad Fitzpatrick2010-10-131-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | responsiveness ANR docs" into gingerbread Merge commit '4711d21a55d9ff6f234d3b06ff2d07dca19238fc' * commit '4711d21a55d9ff6f234d3b06ff2d07dca19238fc': StrictMode: link to designing for responsiveness ANR docs
| * | | | am 9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR ↵Brad Fitzpatrick2010-10-121-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs" into gingerbread Merge commit '9facd2d0847691ae46108713d6a7dc9f51a62135' into gingerbread-plus-aosp * commit '9facd2d0847691ae46108713d6a7dc9f51a62135': StrictMode: link to designing for responsiveness ANR docs
| | * | | StrictMode: link to designing for responsiveness ANR docsBrad Fitzpatrick2010-10-111-0/+4
| | |/ / | | | | | | | | | | | | Change-Id: If65849aaa8317e7e40b2837b640a5cdb95fe7b0e
* | | | am 4c2c62fe: am bed5af7e: am 456fe3b3: add some pages to the sitemap file in ↵Scott Main2010-10-111-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | an attempt to kick-start the build server so i can get a doc build Merge commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3' * commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3': add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
| * | | am bed5af7e: am 456fe3b3: add some pages to the sitemap file in an attempt ↵Scott Main2010-10-081-0/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | to kick-start the build server so i can get a doc build Merge commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6' into gingerbread-plus-aosp * commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6': add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
| | * | am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start ↵Scott Main2010-10-081-0/+5
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | the build server so i can get a doc build Merge commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15' into gingerbread * commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15': add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
| | | * add some pages to the sitemap file in an attempt to kick-start the build ↵Scott Main2010-10-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | server so i can get a doc build Change-Id: If1a33d5f5ee1f3b39c5592748e3d584e060b7278
* | | | am 59d5d966: am 3d265b57: am 50f86c65: docs: a few style adjustments to ↵Scott Main2010-10-111-43/+81
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | admin doc Merge commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce' * commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce': docs: a few style adjustments to admin doc
| * | | am 3d265b57: am 50f86c65: docs: a few style adjustments to admin docScott Main2010-10-081-43/+81
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '3d265b5775a74b1d5eb726238f13cf63e8465594' into gingerbread-plus-aosp * commit '3d265b5775a74b1d5eb726238f13cf63e8465594': docs: a few style adjustments to admin doc
| | * | am 50f86c65: docs: a few style adjustments to admin docScott Main2010-10-081-43/+81
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Merge commit '50f86c65206072be0ca924f03b8d460365199bcd' into gingerbread * commit '50f86c65206072be0ca924f03b8d460365199bcd': docs: a few style adjustments to admin doc
generated by cgit v1.1 at 2025-11-26 16:27:34 +0000