summaryrefslogtreecommitdiffstats
path: root/docs/html
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Be brief." into gingerbreadElliott Hughes2010-09-071-182/+41
|\
| * Be brief.Elliott Hughes2010-07-281-182/+41
| | | | | | | | | | | | | | Excise much of the non-Android blurb so we don't distract from our primary messages of "allocate less stuff" and "do less work". Change-Id: Ifc2c12bc953dbfbaf4078d4f7b77aa75d1d942d7
* | am c4367e54: fix code snippet errorScott Main2010-09-031-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Merge commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3' into gingerbread * commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3': fix code snippet error
| * | fix code snippet errorScott Main2010-09-031-2/+2
| | | | | | | | | | | | Change-Id: Ida2f5ac2bc0bfb9b13b142f6422dd4b815603ab5
* | | am c5083cdf: Merge "clarify dp dimension description" into froyoScott Main2010-09-021-4/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879' into gingerbread * commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879': clarify dp dimension description
| * | Merge "clarify dp dimension description" into froyoScott Main2010-09-021-4/+7
| |\ \
| | * | clarify dp dimension descriptionScott Main2010-08-161-4/+7
| | | | | | | | | | | | | | | | Change-Id: I85152f8ab668984ca9db3a4f56c4f8a5ab6ebacd
* | | | 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
* | | | 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 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 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 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 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 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 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 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 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 3bf5c4cd: Merge "fix markup error bug:2871538" into froyoScott Main2010-07-281-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a' into gingerbread * commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a': fix markup error
| * | fix markup errorScott Main2010-07-281-2/+2
| | | | | | | | | | | | | | | | | | bug:2871538 Change-Id: I7ab4a9bb722ee8b3e5d740f79143776be8b56a6f
* | | am 0ac8ac30: Doc change: Add docs for licensing service.Dirk Dougherty2010-07-2613-12/+2422
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '0ac8ac301d056604485aeca9ffe5ce8d1e63ef19' into gingerbread * commit '0ac8ac301d056604485aeca9ffe5ce8d1e63ef19': Doc change: Add docs for licensing service.
| * | Doc change: Add docs for licensing service.Dirk Dougherty2010-07-2613-12/+2422
| |/ | | | | | | Change-Id: Ia78467b8857cb8e83ab3920f4126bc7985a9d93d
* | am 2316d626: docs: add information about using color resources as drawablesScott Main2010-07-202-5/+13
|\ \ | |/ | | | | | | | | | | Merge commit '2316d6260862230af10d8ca3ff446ad3f560f712' into gingerbread * commit '2316d6260862230af10d8ca3ff446ad3f560f712': docs: add information about using color resources as drawables
| * docs: add information about using color resources as drawablesScott Main2010-07-202-5/+13
| | | | | | | | Change-Id: I24d82292b700104294d268894b660bc8b7e5ddb0
* | am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about ↵Scott Main2010-07-191-0/+2
|\ \ | |/ | | | | | | | | | | | | | | restarting adb" into froyo Merge commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d' into gingerbread * commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d': docs: add troubleshooting to eclipse guide about restarting adb
| * docs: add troubleshooting to eclipse guide about restarting adbScott Main2010-07-161-0/+2
| | | | | | | | Change-Id: I44bf5f488a2a322dabe86ec2e4f25169fc7091ce
* | am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyoScott Main2010-07-165-763/+874
|\ \ | |/ | | | | | | | | | | Merge commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1' into gingerbread * commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1': docs: editorial revisions to Search guide
| * Merge "docs: editorial revisions to Search guide" into froyoScott Main2010-07-165-763/+874
| |\
| | * docs: editorial revisions to Search guideScott Main2010-07-165-763/+874
| | | | | | | | | | | | Change-Id: I6a2065304d1d80c46f3bb3c658ab55f1fe58b211
* | | am d59f1dea: Merge "docs: update notepad tutorial to change EditNote ↵Scott Main2010-07-152-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | activity title and update codelab zip" into froyo Merge commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c' into gingerbread * commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c': docs: update notepad tutorial to change EditNote activity title and update codelab zip
| * | Merge "docs: update notepad tutorial to change EditNote activity title and ↵Scott Main2010-07-152-1/+5
| |\ \ | | | | | | | | | | | | update codelab zip" into froyo
| | * | docs: update notepad tutorial to change EditNote activity title and update ↵Scott Main2010-06-172-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | codelab zip bug: 2762919 Change-Id: Iad1698893b949d921d2807730041e07694c06571
* | | | am 80fa5c86: docs: dashboard updateScott Main2010-07-152-12/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '80fa5c866eaf323c39bef4159a351950f0ea527a' into gingerbread * commit '80fa5c866eaf323c39bef4159a351950f0ea527a': docs: dashboard update
| * | | docs: dashboard updateScott Main2010-07-152-12/+12
| | | | | | | | | | | | | | | | Change-Id: I289cc30b0ae2f88429a8a01b4b7219a86b6d479c
* | | | am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyoKatie McCormick2010-07-152-171/+98
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '28da8e5e4aefd919064e3c33a311edf1af5a958e' into gingerbread * commit '28da8e5e4aefd919064e3c33a311edf1af5a958e': Doc change: Update AVD create instructions.
| * | | Merge "Doc change: Update AVD create instructions." into froyoKatie McCormick2010-07-152-171/+98
| |\ \ \ | | |_|/ | |/| |
| | * | Doc change: Update AVD create instructions.Katie McCormick2010-07-152-171/+98
| | | | | | | | | | | | | | | | Change-Id: Icb1a8200d1b8de4aedea0718a014ab57e057235d
* | | | am 38137d7a: Merge "docs: lots of additions to the resources docs new ↵Scott Main2010-07-157-194/+1350
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread * commit '38137d7a27b037611c70a9d900aa53b4c15563bf': docs: lots of additions to the resources docs
| * | | Merge "docs: lots of additions to the resources docs new drawable resources ↵Scott Main2010-07-157-194/+1350
| |\ \ \ | | | | | | | | | | | | | | | add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo