960 Commits

Author	SHA1	Message	Date
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
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	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
Scott Main	41ec65355b	docs: add links from widget classes to tutorials ... Change-Id: I817e885524951853182b0458df4a32dea1614243	2010-08-19 17:07:13 -07:00
Trevor Johns	1ef758b817	am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo ... Merge commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60' into gingerbread-plus-aosp * commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60': Fix subscribe links for Developer Forums doc.	2010-08-12 14:33:33 -07:00
Trevor Johns	404bffbeab	am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo ... Merge commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795' into gingerbread * commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795': Fix subscribe links for Developer Forums doc.	2010-08-12 14:30:11 -07:00
Trevor Johns	ca56ffe9e8	Fix subscribe links for Developer Forums doc. ... 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	2010-08-10 11:41:56 -07:00
Scott Main	c9de8c34a3	am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class ... Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp * commit '97c2d840a10813164d82571775a3566637d6c5de': fix some doc errors in the resources;	2010-08-04 18:05:26 -07:00
Scott Main	97c2d840a1	am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class ... Merge commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41' into gingerbread * commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41': fix some doc errors in the resources;	2010-08-04 18:02:25 -07:00
Scott Main	8dd87ad944	fix some doc errors in the resources; ... add link to resource docs for ColorStateList class Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502	2010-08-04 17:33:33 -07:00
Scott Main	fa32a45af7	am f2d16bc5: am 5aa4680e: update device dashboard ... Merge commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb' into gingerbread-plus-aosp * commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb': update device dashboard	2010-08-02 17:45:05 -07:00
Scott Main	f2d16bc595	am 5aa4680e: update device dashboard ... Merge commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d' into gingerbread * commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d': update device dashboard	2010-08-02 17:42:11 -07:00
Scott Main	5aa4680eb0	update device dashboard ... Change-Id: I79ebf6fa740e19f32d724e9b8a387f2a143fdf7a	2010-08-02 17:38:37 -07:00
Scott Main	77a66069eb	am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo ... Merge commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp * commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368': Doc change: Add nexus one to dev phones.	2010-08-02 09:29:49 -07:00
Scott Main	d3579580df	am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo ... Merge commit '9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread * commit '9cd797902ec8404c5958214fc078d75e87248bf3': Doc change: Add nexus one to dev phones.	2010-08-02 09:23:50 -07:00
Scott Main	9cd797902e	Merge "Doc change: Add nexus one to dev phones." into froyo	2010-08-02 09:16:30 -07:00
Dirk Dougherty	bd5029403e	am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc. ... Merge commit '483b20e5ae65495d841de1844d97d79fbc0c1866' into gingerbread-plus-aosp * commit '483b20e5ae65495d841de1844d97d79fbc0c1866': Doc change: Cleanup for licensing doc.	2010-07-30 17:40:28 -07:00
Dirk Dougherty	483b20e5ae	am 2ff1ba01: Doc change: Cleanup for licensing doc. ... Merge commit '2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread * commit '2ff1ba012c59169c9719cfab4516b9149414380b': Doc change: Cleanup for licensing doc.	2010-07-30 17:37:39 -07:00
Dirk Dougherty	2ff1ba012c	Doc change: Cleanup for licensing doc. ... Change-Id: Iff046768d70adf0489f5241212061045cef2572f	2010-07-30 16:00:18 -07:00
Gilles Debunne	c943e174f6	am 4609b0a8: am 3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo ... Merge commit '4609b0a8fcfbed9b893301232dfa3b70bb30e4e2' into gingerbread-plus-aosp * commit '4609b0a8fcfbed9b893301232dfa3b70bb30e4e2': Fixes regarding densities in "Providing Resources" documentation page.	2010-07-30 11:56:36 -07:00
Gilles Debunne	4609b0a8fc	am 3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo ... Merge commit '3d8d9440d844816f065d2b10eb75bb693683cdad' into gingerbread * commit '3d8d9440d844816f065d2b10eb75bb693683cdad': Fixes regarding densities in "Providing Resources" documentation page.	2010-07-30 11:53:21 -07:00
Gilles Debunne	c09a6977ae	Fixes regarding densities in "Providing Resources" documentation page. ... 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	2010-07-29 16:54:03 -07:00
Romain Guy	0f0b71600b	am e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)" ... Merge commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5' into gingerbread-plus-aosp * commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5': Fixed a documentation Bug (Issue 9236)	2010-07-29 14:32:29 -07:00
Romain Guy	e53fe4a465	Merge "Fixed a documentation Bug (Issue 9236)"	2010-07-29 14:00:02 -07:00
Scott Main	4e235622bc	am b1bb7180: am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo ... Merge commit 'b1bb7180ec3446208ea717d96f6a507ea9955a13' into gingerbread-plus-aosp * commit 'b1bb7180ec3446208ea717d96f6a507ea9955a13': fix markup error	2010-07-28 14:27:13 -07:00
Scott Main	b1bb7180ec	am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo ... Merge commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a' into gingerbread * commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a': fix markup error	2010-07-28 14:23:16 -07:00
Scott Main	8a52f3d683	fix markup error ... bug:2871538 Change-Id: I7ab4a9bb722ee8b3e5d740f79143776be8b56a6f	2010-07-28 14:15:26 -07:00
Dirk Dougherty	68344ba8a8	am 2b989e1f: am 0ac8ac30: Doc change: Add docs for licensing service. ... Merge commit '2b989e1f7d08efd51652b56b1cb1fef76a1e8ab1' into gingerbread-plus-aosp * commit '2b989e1f7d08efd51652b56b1cb1fef76a1e8ab1': Doc change: Add docs for licensing service.	2010-07-26 20:04:28 -07:00
Dirk Dougherty	2b989e1f7d	am 0ac8ac30: Doc change: Add docs for licensing service. ... Merge commit '0ac8ac301d056604485aeca9ffe5ce8d1e63ef19' into gingerbread * commit '0ac8ac301d056604485aeca9ffe5ce8d1e63ef19': Doc change: Add docs for licensing service.	2010-07-26 20:01:12 -07:00
Dirk Dougherty	0ac8ac301d	Doc change: Add docs for licensing service. ... Change-Id: Ia78467b8857cb8e83ab3920f4126bc7985a9d93d	2010-07-26 11:07:24 -07:00
Dirk Dougherty	d116e3ee82	Doc change: Add nexus one to dev phones. ... Change-Id: I45d0207bff857db7355da6b7736d6a6a729a878a	2010-07-23 13:26:24 -07:00
Scott Main	3b3e368c73	am 60a20061: am 2316d626: docs: add information about using color resources as drawables ... Merge commit '60a200617791cf4dd3660c514ac6bf17dfcb85de' into gingerbread-plus-aosp * commit '60a200617791cf4dd3660c514ac6bf17dfcb85de': docs: add information about using color resources as drawables	2010-07-20 14:01:33 -07:00
Scott Main	60a2006177	am 2316d626: docs: add information about using color resources as drawables ... Merge commit '2316d6260862230af10d8ca3ff446ad3f560f712' into gingerbread * commit '2316d6260862230af10d8ca3ff446ad3f560f712': docs: add information about using color resources as drawables	2010-07-20 13:53:55 -07:00
Scott Main	2316d62608	docs: add information about using color resources as drawables ... Change-Id: I24d82292b700104294d268894b660bc8b7e5ddb0	2010-07-20 10:28:09 -07:00
Scott Main	3dfa6ec5f3	am 945ac54d: am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo ... Merge commit '945ac54da56f79c8407c0111d6ded25afcc159fc' into gingerbread-plus-aosp * commit '945ac54da56f79c8407c0111d6ded25afcc159fc': docs: add troubleshooting to eclipse guide about restarting adb	2010-07-19 14:52:35 -07:00
Scott Main	945ac54da5	am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo ... Merge commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d' into gingerbread * commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d': docs: add troubleshooting to eclipse guide about restarting adb	2010-07-19 14:50:32 -07:00
Scott Main	7e48908463	docs: add troubleshooting to eclipse guide about restarting adb ... Change-Id: I44bf5f488a2a322dabe86ec2e4f25169fc7091ce	2010-07-16 15:04:22 -07:00
Scott Main	aba4bf19fb	am e068b464: am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo ... Merge commit 'e068b46408f3ff390b47dc78ccf10fab76883051' into gingerbread-plus-aosp * commit 'e068b46408f3ff390b47dc78ccf10fab76883051': docs: editorial revisions to Search guide	2010-07-16 15:02:30 -07:00
Scott Main	e068b46408	am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo ... Merge commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1' into gingerbread * commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1': docs: editorial revisions to Search guide	2010-07-16 14:59:48 -07:00
Scott Main	2a8dd4e46f	Merge "docs: editorial revisions to Search guide" into froyo	2010-07-16 14:52:03 -07:00
Scott Main	5e892d8183	docs: editorial revisions to Search guide ... Change-Id: I6a2065304d1d80c46f3bb3c658ab55f1fe58b211	2010-07-16 14:33:14 -07:00